public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,520 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1520 Commits (4195e11a41c5992bc555cef71246800bceaf1915)

Author SHA1 Message Date
John McLear f3845c4020 Merge pull request #718 from 0ip/remove_old_css 
Remove old Etherpad CSS code
 2012-05-20 05:57:42 -07:00
0ip afe060e2b8 Remove even more old code 2012-05-20 14:53:30 +02:00
0ip 0d68cd23ba Remove old CSS code 2012-05-20 14:48:02 +02:00
John McLear fbc2cb32b3 Merge pull request #705 from johnyma22/removeWordle 
Remove wordle
 2012-05-19 05:58:38 -07:00
John McLear 53bfc380af Merge pull request #703 from cweider/remove-onclick 
Remove onclick
 2012-05-19 05:41:49 -07:00
John McLear f3036eb124 Merge pull request #715 from redhog/master 
Bugfix for IE and document.domain
 2012-05-18 10:19:44 -07:00
Egil Moeller 9f46678e5d Bugfix for IE and document.domain 2012-05-18 18:57:18 +02:00
John McLear ee11338927 Merge pull request #709 from cweider/packaging 
Packaging
 2012-05-17 04:59:24 -07:00
John McLear 1043d607d0 Merge pull request #712 from edy-b/issue-707 
Don't set cached cookies, fixes issue #707
 2012-05-17 04:57:22 -07:00
Edy e8639d87ce fixes issue #707 
Don't set cached cookies
 2012-05-17 12:08:19 +02:00
Chad Weider a9eb2d4e31 Fix ordering of editer code loading operations. 2012-05-14 19:01:00 -07:00
Chad Weider 9b0e2287aa Add plugin framwork to common package. 2012-05-14 18:20:16 -07:00
Chad Weider 1a2c6425e1 Extract ace2_common into its own package. 2012-05-14 18:20:16 -07:00
Chad Weider 384523859e Require ace2_common separately. 2012-05-14 18:20:16 -07:00
Chad Weider 97c7842d19 Remove unused line. 2012-05-14 18:20:16 -07:00
Chad Weider 4680bfaee8 Upgrade yajsml version. 
Fixes parent-relative redirects and prints results more nicely.
 2012-05-14 18:14:50 -07:00
Chad Weider d65092e067 Move id, '*link' to the link. 2012-05-14 17:11:05 -07:00
Chad Weider 9942c577dc Patch tablet styling. 2012-05-13 15:33:22 -07:00
Chad Weider 5d0c853889 Remove unnecessary styles. 2012-05-13 15:33:22 -07:00
Chad Weider f802a79da6 Make styles less restrictive. 2012-05-13 15:33:22 -07:00
Chad Weider 818c3ef40d Shift button appearance onto anchor. 2012-05-13 15:33:22 -07:00
Chad Weider 089e0227fd Shift editbar styles around. 2012-05-13 15:33:22 -07:00
Chad Weider 1ea889bfab Anchors are not icons 2012-05-13 15:33:22 -07:00
Chad Weider 2a3fce0cf1 The showusers control is an anchor. 2012-05-13 15:33:22 -07:00
Chad Weider ab8b2cae21 Remove nonsense styles. 2012-05-13 15:33:22 -07:00
Chad Weider dc0fb12b09 Remove onclick attributes from editbar. 2012-05-13 15:33:22 -07:00
John McLear def904dbed remove wordle 2012-05-13 20:20:18 +01:00
John McLear dc8495765f Merge branch 'develop' of git://github.com/Pita/etherpad-lite into removeWordle 2012-05-13 20:15:39 +01:00
John McLear a3075b2137 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop 2012-05-13 14:56:29 +01:00
John McLear 916e52a1eb Merge pull request #609 from prauscher/disable-passwords 
Disable passwords
 2012-05-13 06:55:47 -07:00
John McLear c70d88eedc Merge pull request #667 from fourplusone/feature/cleaner_code 
Removing unused code - All looks good, some minor tweeks are probably worthwhile  in the future.
 2012-05-13 06:51:58 -07:00
0ip 99ecadc0c3 Fix #655, wrong located APIKEY.txt 2012-05-13 00:34:26 +03:00
John McLear 476065b68d Merge pull request #627 from edy-b/body-block 
add more blocks to pad.html
 2012-05-12 14:18:28 -07:00
0ip c406d076de Updated socket.io 2012-05-02 19:12:57 +03:00
Edy 47a257ff72 accidentally deleted an end block in last merge 2012-05-01 12:02:12 +02:00
Edy 1329e93639 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block 
Conflicts:
	src/templates/pad.html
 2012-05-01 11:35:06 +02:00
adammawson b5f92edec1 just fixing somet paths in the checkpad script.. 2012-04-30 18:24:38 +01:00
John McLear 73a962e6ca Correct dependency paths for checkPad script. 2012-04-30 19:23:41 +02:00
John McLear 40af25d282 Merge pull request #685 from 0ip/typo 
Fix #666 - Typo "seperator"
 2012-04-30 08:00:05 -07:00
0ip 64db697558 Fixed typos 2012-04-30 16:54:19 +02:00
0ip 7a09d97731 Fix #683 - Disabling authorship colors doesn't work 2012-04-30 17:40:29 +03:00
John McLear 34a2f8cb5d Merge pull request #684 from 0ip/remove_qr_code 
Remove QR-code
 2012-04-30 06:57:42 -07:00
0ip 23cdb2a5c6 Removed QR-Code 2012-04-30 15:54:21 +02:00
Edy cf54c23228 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block 
Resolved conflicts:
	src/templates/pad.html
 2012-04-30 15:17:23 +02:00
0ip 96eb8ac004 100% is not needed here http://ragefac.es/416 2012-04-29 21:19:34 +03:00
John McLear bf568b3477 Merge pull request #682 from fourplusone/fix/fix-677 
fixed plugins.js
 2012-04-29 11:13:45 -07:00
Matthias Bartelmeß fa622857b9 fixed plugins.js 2012-04-29 20:12:15 +02:00
John McLear 122986798e Merge pull request #681 from fourplusone/fix/fix-677 
fixed socket.io in timeslider.js
 2012-04-29 11:11:25 -07:00
Matthias Bartelmeß cbb5a043b8 fixed socket.io in timeslider.js 2012-04-29 20:04:00 +02:00
John McLear a73192b10d Merge pull request #680 from fourplusone/fix/fix-677 
Fix #677
 2012-04-29 10:57:35 -07:00