libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2286 commits 2 branches 0 tags 24 MiB
Commit graph

2286 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
4a7ab12859 Merge pull request #649 from rassie/patch-1 
Corrected color picker: `jQuery(...).css('background-color')` returns…
 2012-04-19 08:37:09 -07:00
John McLear
9fe8a7530d Merge pull request #641 from 0ip/highlight_module 
Fix | Highlight currently opened module
 2012-04-19 08:23:51 -07:00
John McLear
064568d169 Merge pull request #653 from 0ip/plugins_page 
Restore plugin manager UI
 2012-04-19 08:18:49 -07:00
0ip
31909f6e60 Added viewport 2012-04-19 17:04:44 +02:00
0ip
ef88d2798e Restore overwritten plugin manager UI 2012-04-19 17:00:29 +02:00
johnyma22
b00a6204c6 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-04-19 15:12:12 +01:00
John McLear
fc6e5177a9 Merge pull request #651 from redhog/master 
Actually usable plugin manager, and way better security/authentication management
 2012-04-19 07:11:24 -07:00
Egil Moeller
ecac40d062 Changed the authentication mechanism to support hooks 2012-04-19 16:04:03 +02:00
Egil Moeller
7b39da2d69 Bugfix for callFirst to actually call call hooks until it finds one that returns non-empty, which is actually usefull, as opposed to just calling one hook. 2012-04-19 16:03:42 +02:00
Nikolai Prokoschenko
576fe06682 Corrected color picker: jQuery(...).css('background-color') returns a hex notation in IE8 and rgb() in every other browser. 2012-04-19 16:44:19 +03:00
Egil Moeller
ac36a99a72 More general basic auth 2012-04-19 14:25:12 +02:00
Martyn York
da75b87d3c added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe. 2012-04-18 14:44:25 -07:00
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
John McLear
7ede4872b1 Merge pull request #645 from redhog/master 
Bugfixes
 2012-04-17 13:42:57 -07: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
0ip
d75aeeaf8f pad_editbar adapated hacky highlighting of currently opened module to recent changes 2012-04-16 15:23:19 +02:00
0ip
3e47300587 template/pad.html removed id duplicates, moved revision button, converted TABS to spaces 2012-04-16 15:19:53 +02:00
0ip
9cbb897c45 template/pad.html removed some whitespace 2012-04-16 15:13:07 +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
Edy
f4be70c45e add more blocks to pad.html 
... to allow plugins to be more flexible extending etherpad
 2012-04-12 20:24:38 +02: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
johnyma22
baf215fae6 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-04-09 13:49:06 +01: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