fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,367 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

1367 Commits

Author SHA1 Message Date
Egil Moeller 4c1d94343f Better plugin admin interface 2012-04-18 13:43:34 +02:00
Egil Moeller d6f476312d Spelling bugfixes 2012-04-18 10:16:41 +02:00
Egil Moeller 7ab7ee9f5e Plugin admin fixes 2012-04-17 22:40:53 +02:00
Egil Moeller 6f774bc6a5 Separated out the code for the plugin manager 2012-04-17 22:40:46 +02:00
Egil Moeller f80f9fc59f Merge commit 'd5120c9' into pita 2012-04-17 22:34:45 +02:00
Egil Moeller 3a62c6d2ab Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange 2012-04-17 22:32:46 +02:00
John McLear 7cf4510bf5 Merge pull request #637 from fourplusone/feature/timeslider_cleanup 
Feature/timeslider cleanup
 2012-04-15 12:11:46 -07:00
John McLear 0e0e084077 Merge pull request #636 from fourplusone/fix/timeslider_authors 
Fix/timeslider authors
 2012-04-15 12:11:38 -07:00
Matthias Bartelmeß e664320b8c removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere 2012-04-15 19:25:23 +02:00
Matthias Bartelmeß d834c42ffc avoid missing anon. timeslider authors 2012-04-15 19:18:29 +02:00
John McLear f4fe98265f Merge pull request #631 from jhollinger/develop 
Fix re-enabling of line numbers
 2012-04-13 14:51:57 -07:00
Jordan Hollinger 06f36664b8 Fix re-enabling line numbers. issue #618 2012-04-13 17:21:07 -04:00
John McLear cba2c1f83a Merge pull request #630 from jhollinger/develop 
Don't require http auth for static paths
 2012-04-13 07:51:02 -07:00
Jordan Hollinger 362ef454b8 Don't block static paths with http auth 2012-04-13 05:17:48 -04:00
0ip 3dd24bdf6f forgot to remove a ',' ^.^ 2012-04-11 22:25:04 +03:00
0ip 05fcf4ba4a Having "maxAge" twice doesn't double the fun 2012-04-11 22:22:28 +03:00
John McLear eed18feed7 Merge pull request #624 from 0ip/admin_css 
Admin css
 2012-04-11 10:46:49 -07:00
0ip 8fa54e2402 admin interface styling and sensibility 2012-04-11 19:44:18 +02:00
John McLear 4f5ac851cc Merge pull request #622 from cweider/fix-firefox 
Fix firefox
 2012-04-11 05:28:39 -07:00
Chad Weider e695c716e5 Work around strange order of execution bug in Firefox. Fixes #620 2012-04-11 02:08:50 -07:00
Chad Weider b767192c58 Revert "Made it possible to disable minification again" 
This reverts commit 22eaa6ffc0.
 2012-04-11 02:08:50 -07:00
John McLear 67d9f73ce9 Merge pull request #617 from 0ip/prefix 
Prefixed css files
 2012-04-09 09:16:51 -07:00
0ip 50c79df272 prefixed css files containing css3 attributes due to recently removed prefixfree.js 2012-04-09 17:52:43 +02:00
0ip 77936c6c12 removed a weird plus 2012-04-09 18:42:09 +03:00
John McLear f9d8cea114 Merge pull request #612 from levu42/bug-user-scroll 
Userlists now scrolls if there are too many users
 2012-04-09 06:37:03 -07:00
John McLear 49b4fdfce3 Merge pull request #616 from 0ip/develop 
Userlist: users now don't overlap other objects
 2012-04-09 06:25:29 -07:00
0ip c3095bbd1b improved userlist ux (prevent overlapping of objects) 2012-04-09 15:16:40 +02:00
0ip 60eea0a3cf Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop 2012-04-09 15:10:08 +02:00
John McLear 18038ddd50 Merge pull request #614 from fourplusone/ace2_refactoring 
Adding more hooks + some code refactoring
 2012-04-08 17:28:47 -07:00
Matthias Bartelmeß c3ce00a82d added a comment on skiplist.js 2012-04-08 21:21:52 +02:00
Matthias Bartelmeß b7a0b36b5e ...well stupid error 2012-04-08 21:21:30 +02:00
Matthias Bartelmeß 2406800cd6 documentation on AttributeManager 2012-04-08 21:21:05 +02:00
Peter 'Pita' Martischka 4e1a088d22 Merge pull request #613 from prauscher/fix-apicall 
bugfix for some crashes through stack overflows
 2012-04-08 10:54:33 -07:00
Patrick Rauscher 867cc94806 bugfix for some crashes through stack overflows 2012-04-08 17:48:30 +00:00
levu 9e063341ce fix for bug 'userlist not scrolling' 2012-04-08 16:22:00 +02:00
Peter 'Pita' Martischka 3478649973 Merge pull request #610 from prauscher/fix-api 
Fix api
 2012-04-07 07:22:11 -07:00
Patrick Rauscher 6da38fd8bc bugfix to use the API again 2012-04-07 13:40:02 +00:00
John McLear 2435003403 Merge pull request #607 from fourplusone/fix/list-removal 
Fix list removal
 2012-04-07 04:29:24 -07:00
Matthias Bartelmeß 62c9b1c25e Merge branch 'fix/list-removal' into ace2_refactoring 2012-04-07 10:26:21 +02:00
Matthias Bartelmeß 8be1deda6f Merge branch 'develop' into fix/list-removal 2012-04-07 03:42:16 +02:00
Matthias Bartelmeß 18dc111010 Fixing bug where lists get deleted when pressing enter 2012-04-07 03:42:05 +02:00
Matthias Bartelmeß 1e8e071693 Merge commit '57e137f65bd5152c0c2dc8508c796674d3289545' into ace2_refactoring 2012-04-07 02:14:43 +02:00
Matthias Bartelmeß 2db74150ee linestylefilter now uses attributemanager to find lineattributemarkers 2012-04-07 02:14:19 +02:00
Matthias Bartelmeß a0235126e4 syntax candy 2012-04-07 02:13:26 +02:00
Matthias Bartelmeß 6507614e45 made domline and content collector lineAttributes compatible 2012-04-07 02:12:42 +02:00
John McLear 57e137f65b Merge pull request #599 from fourplusone/ace2_refactoring 
ACE2 refactoring
 2012-04-06 17:07:49 -07:00
Matthias Bartelmeß 9efe838a32 removed unused variable 2012-04-07 01:57:10 +02:00
Matthias Bartelmeß c79593569a added aceEditorCSS hook 2012-04-07 01:40:13 +02:00
Matthias Bartelmeß 34f07efcfb Delete key removes line attributes if prev line is not emtpy 2012-04-07 01:07:25 +02:00
Matthias Bartelmeß 38276e636c postAceInit passes ace instance 2012-04-07 01:06:29 +02:00