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

1297 commits

Author SHA1 Message Date
John McLear
b72127c327 different font families for people with dyslexia 2015-03-25 12:24:20 +00:00
Thomas Muehlichen
e8d85c1173 feature #2558 added functions to get all attributes at the current or an abritrary position 2015-03-25 12:04:10 +01:00
John McLear
5761e998de first semi working alt f9 functionality 2015-03-25 11:03:45 +00:00
cristo-rabani
ed3ec96838 own list 2015-03-24 20:04:28 +01:00
John McLear
a67664055d disable cut renumbering of OLs so cut paste works 2015-03-24 09:58:02 +00:00
John McLear
83e6591f1a temp fix for cut paste but might break some OL functionality 2015-03-24 09:52:17 +00:00
cristo-rabani
382804e44c fix 2015-03-22 23:14:17 +01:00
Thomas Muehlichen
a3f07c1048 fixes #2556 (error toggling line attribute) and clarified method documentation (AttributeManager.toggleAttributeOnLine) 2015-03-20 11:58:56 +01:00
lid2000
7894545556 Return true from handleCut function 2015-03-13 16:01:18 +11:00
Cristo
da1bf00a78 fixed + support for value 2015-03-06 23:02:31 +01:00
John McLear
56dbad41ad a should always have white space pre-wrap stops caret walking in chrome on them 2015-03-04 17:46:49 +00:00
Chris Ball
063219bbce Trigger renumbering when deleting (via cut) the first item of a list 
Fixes #2514.
 2015-02-27 12:54:29 -05:00
John McLear
178309e10d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-26 12:13:41 +00:00
John McLear
1c044588e6 mobile stylings for chat always on screen 2015-02-22 17:56:44 +00:00
webzwo0i
c9a5167b41 throw in applyToText and not in applyToAText 2015-02-16 06:27:18 +01:00
webzwo0i
83e1bf0dc4 add semicolons 2015-02-16 03:33:57 +01:00
webzwo0i
440f74b2c1 we do not have the text/padid, but at least we can print the changeset 2015-02-15 15:47:45 +01:00
webzwo0i
b9dd983f81 print the actual text... 2015-02-15 15:27:27 +01:00
webzwo0i
c6ef7f4867 string concat, not multiple arguments... 2015-02-15 15:26:07 +01:00
webzwo0i
1f6a9afae4 better error message 2015-02-15 15:23:43 +01:00
webzwo0i
e7f01fa498 remove unnecessary code; because we have checks in every op now we don't 
need this anymore
 2015-02-15 15:12:24 +01:00
webzwo0i
ac2c7e9679 add newline counting for - and + op 2015-02-15 15:09:38 +01:00
webzwo0i
b4d4b16b1f off by 1 2015-02-15 14:56:20 +01:00
webzwo0i
4313bd27f8 add a comment to make clear that the string in stringIterator 
does not change; only curIndex is increased. Newlines are counted
between curIndex and the end of string.
 2015-02-15 13:25:57 +01:00
webzwo0i
c191a8716e totally wrong, introduced by myself in 
3354b9406b
the first part is always false so the second part which is always true
in case a cs deleted some lines was never triggered...sigh
 2015-02-14 16:41:50 +01:00
John McLear
275592e423 seems right 2015-02-11 02:07:20 +00:00
John McLear
0ad09c17db fix JS error in timeslider if offset doesn't exist 2015-02-09 23:04:30 +00:00
John McLear
26ae375727 minor css polish for user input 2015-02-09 19:53:32 +00:00
John McLear
b216f9271b should be final logic for chatandusers 2015-02-09 19:11:35 +00:00
John McLear
5245d2b797 and even mroe polish 2015-02-09 18:36:11 +00:00
John McLear
8c6507e78c more styling stuff 2015-02-09 18:01:45 +00:00
John McLear
4af46921e1 better css 2015-02-09 17:37:20 +00:00
John McLear
7adcd5cba4 cleaner fix for queue issue 2015-02-08 14:34:48 +00:00
John McLear
1652ed42c5 fix scroll issue where focus is not well managed 
remove console logs
 2015-02-07 23:26:02 +00:00
John McLear
35da64be5c hrm bit of a hack, anyone any ideas on better way? 2015-01-28 19:09:47 +00:00
John McLear
0216a10a12 better variable name 2015-01-27 20:10:38 +00:00
John McLear
bdfce1cbef change to cc.. 2015-01-27 19:41:01 +00:00
John McLear
8fbd7d83b6 content collector should also register the blocks, no idea why this wasnt in before 2015-01-27 19:16:36 +00:00
John McLear
c4f1189ebd even cleaner 2015-01-26 02:39:43 +00:00
John McLear
18121a1507 much cleaner 2015-01-26 02:32:58 +00:00
John McLear
8156930208 clean support for image hook 2015-01-26 01:44:40 +00:00
John McLear
aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear
f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00
John McLear
3f08bf7405 Merge pull request #2490 from Gared/https_plugins_json 
Use https to download plugins.json
 2015-01-24 13:34:41 +00:00
Stefan
da86110f58 Use https to download plugins.json 2015-01-24 12:55:17 +01:00
Stefan
713b369fc3 Add 'last update' column to plugins table 2015-01-24 12:49:17 +01:00
John McLear
5dce72d419 chrome list handling fix for #2412 2015-01-23 01:47:12 +00:00
John McLear
036dea3d0f styling 2015-01-21 17:25:06 +00:00
John McLear
657974b518 move saved revs notification to gritter 2015-01-21 16:40:44 +00:00
John McLear
753e8fdf0b working logic 2015-01-21 16:08:54 +00:00
John McLear
17fa87552d styling 2015-01-21 15:48:21 +00:00
John McLear
941cc3c24b url param 2015-01-21 15:37:55 +00:00
John McLear
920ec9c553 Merge pull request #2467 from ether/chat-and-users 
Show users and Chat at the same time
 2015-01-21 15:22:23 +00:00
John McLear
3cd8759cec expose modernIE value 2015-01-21 15:21:31 +00:00
John McLear
3fd6e72657 try again 2015-01-21 15:06:29 +00:00
John McLear
a2cb8a2f19 rename back to browser 2015-01-21 15:01:39 +00:00
John McLear
f2891e3b8b working 2015-01-21 14:55:29 +00:00
John McLear
ce40cacafa mheh looks fixed 2015-01-21 14:49:06 +00:00
John McLear
990e14c904 working with a big hack 2015-01-21 14:25:24 +00:00
John McLear
34d6b31c98 some sanity 2015-01-21 13:24:21 +00:00
John McLear
eacf1118f8 blind attempt to try 2015-01-21 02:55:03 +00:00
John McLear
c315defc31 temp bodge fix 2015-01-19 15:15:52 +00:00
John McLear
ab71bc7c20 hrm 2015-01-19 14:45:49 +00:00
John McLear
edbeb66d5e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-19 14:33:17 +00:00
John McLear
44d1d6cc13 fix ie editing 2015-01-19 14:32:58 +00:00
Cetra Free
f1c9c58c2d Update to timeslider to include base path for easier proxying 2015-01-19 14:28:30 +10:30
Cetra Free
3649118194 Update to timeslider to include base path for easier proxying 2015-01-19 14:25:06 +10:30
John McLear
13eff60dfe mheh I suck at css 0ip would do a way better job of this 2015-01-19 02:13:34 +00:00
John McLear
63c65f784b semi working example 2015-01-19 01:45:49 +00:00
John McLear
33c62329ba better regexp for line items 2015-01-19 00:28:32 +00:00
John McLear
0bd7914c3b dont paste on middle click of link 2015-01-18 23:58:47 +00:00
John McLear
7e69bc65ce remove infinite load was causing pain 2015-01-18 23:03:54 +00:00
John McLear
ca6b729ace fix for ep page view pageup/down 2015-01-18 19:58:38 +00:00
John McLear
83fae22279 allow list text entry up to 16 items 2015-01-18 15:32:48 +00:00
Stefan
3c6db077ed Change domain for plugins.json request 2015-01-18 14:22:27 +01:00
Stefan
4644073399 Prevent dublicates in search results 2015-01-18 13:56:30 +01:00
Stefan
6d6ddd7f9f Prevent form submit on plugin page 2015-01-18 12:15:41 +01:00
Stefan
a080b12eac Add new favicon (32x32) with associated svg file 2015-01-11 22:40:56 +01:00
Marcel Klehr
167e0aea59 Merge pull request #2442 from ether/fix/attribmanager-removeattribonline 
Finally fix AttribManager#removeAttributeOnLine
 2015-01-10 16:35:37 +01:00
webzwo0i
82efcdb430 fix for uls without class 2015-01-09 02:04:03 +01:00
Marcel Klehr
751adb24fd Finally fix AttribManager#removeAttributeOnLine 
return safely if the attribute wasn't found.
fixes #2394
 2015-01-05 18:38:34 +01:00
John McLear
c0078abc75 Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection 2015-01-05 17:15:38 +00:00
John McLear
230302b132 fix timeslider stars and frontend tests, needs css polish 2015-01-01 22:40:45 +00:00
Marcel Klehr
1451eecaf0 Re-implement ace_getAttributeOnSelection 2014-12-31 19:23:09 +01:00
John McLear
8eb723b906 patch for e1c683be3f 2014-12-31 14:16:10 +00:00
John McLear
036b7d2890 Merge pull request #2418 from ether/etherpad-export-and-import 
Full Pad portability (Export/Import)
 2014-12-31 13:32:09 +00:00
John McLear
b5c671a9b6 Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs 
Clean-up after removing list attribute: Remove list numbering attribute
 2014-12-31 13:19:24 +00:00
John McLear
335bf3dc4a more line polish 2014-12-31 01:46:53 +00:00
Marcel Klehr
cfe75c7f3f Clean-up after removing list attribute: Remove list numbering attribute 2014-12-30 17:45:26 +01:00
Stefan
c20a7e9bce Merge pull request #2406 from Gared/fix/author-not-set-callback 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
 2014-12-30 14:55:49 +01:00
Stefan
5df638bfac Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected 
Notify user if cookies can't be created
 2014-12-30 14:54:43 +01:00
John McLear
19c78212e8 Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished 
Fix lineassembler not finished
 2014-12-30 12:19:04 +01:00
John McLear
a07d1722fc no errors on chrome client 2014-12-30 12:12:24 +01:00
John McLear
a2262c56b9 msg for user 2014-12-29 22:05:14 +01:00
John McLear
3773b6346b semi working requires browser refresh 2014-12-29 20:57:58 +01:00
webzwo0i
e1c683be3f differentiate between indents and bullets in unordered lists 2014-12-29 16:12:07 +01:00
John McLear
321d550d43 second fix for user list issue on #2413 2014-12-29 01:20:28 +01:00
John McLear
23570e80a7 unbind before rebind, partial fix towards #2413 issue 2014-12-29 01:17:24 +01:00
John McLear
248d7655d7 Merge pull request #2401 from ether/save-prefs 
set prefs and get prefs
 2014-12-29 01:01:09 +01:00
John McLear
6b1fee400d Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest 2014-12-29 00:40:07 +01:00
Gared
018821e98c Use camel case 2014-12-28 22:20:09 +01:00
John McLear
74eca43965 Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow 
Close extended chat window
 2014-12-28 20:17:30 +01:00
Gared
2307c6fbda Notify user if cookies can't be created 2014-12-28 15:02:56 +01:00
John McLear
68f50ff9fa Merge pull request #2409 from ether/fix-removeAttribOnLine 
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
 2014-12-28 12:52:39 +01:00
Marcel Klehr
362315c638 AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left 2014-12-28 12:34:42 +01:00
John McLear
dd09f6144b Merge pull request #2398 from ether/indentLevels 
Indent levels
 2014-12-27 23:27:11 +01:00
John McLear
c276343216 timeslider fixes 2014-12-27 22:31:23 +01:00
Gared
9cf19b99fe Fix missing callback of #2400 and ignore missing author on timeslider on client-side 2014-12-27 22:25:24 +01:00
John McLear
b1f29b914c minor ts bg fix 2014-12-27 22:05:35 +01:00
webzwo0i
3354b9406b op is ok, if it doesnt include newlines. op is ok, if op.lines is equal to newlines in op.chars 2014-12-27 19:30:02 +01:00
webzwo0i
51c14d9947 check if op.lines is in sync with atext-newlines 
Conflicts:
	src/static/js/Changeset.js
 2014-12-27 19:28:56 +01:00
webzwo0i
251a75346d make stringIterator aware of newlines 2014-12-27 19:25:14 +01:00
John McLear
036df30c0e Merge pull request #2402 from ether/fix-attribmanager-removeLineAttrib 
Fix removeAttributeOnLine: Only remove a single attrib
 2014-12-27 19:23:49 +01:00
John McLear
7df944b3fd Merge pull request #2404 from webzwo0i/sanity-in-atext 
block changeset if it deletes more lines than exist in the whole pad
 2014-12-27 18:36:13 +01:00
webzwo0i
07a6702363 Revert "be more strict in checkRep" 
This reverts commit 22803da42f.
 2014-12-27 17:56:20 +01:00
Marcel Klehr
a63880dcb1 Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib 2014-12-27 16:15:20 +01:00
John McLear
a151c207c2 set prefs and get prefs 2014-12-27 15:08:54 +01:00
John McLear
ae22332f71 removing dokuwiki 2014-12-27 14:08:45 +01:00
John McLear
9d66a446dc support indentation up to 16 levels and dont go back afterwards 2014-12-27 13:18:58 +01:00
John McLear
10d92b6bf1 slightly better attribute selection logic but still pretty b0rked 2014-12-26 23:42:00 +00:00
John McLear
88ab74b1e9 fix flowing of items in editbar 2014-12-24 17:54:13 +00:00
John McLear
b71fb3ad20 fix issue with attributes 2014-12-23 02:38:50 +00:00
John McLear
3fe58068c0 more fixes 2014-12-21 23:16:00 +00:00
John McLear
12aac2d0d0 Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:12:59 +00:00
John McLear
745ef5db1c fix timeslider socket issue 2014-12-21 23:10:56 +00:00
John McLear
a2d22a5764 Merge pull request #2377 from webzwo0i/avoid-global-vairables 
declare var outside of loop
 2014-12-16 16:18:01 +00:00
webzwo0i
0263d30b37 declare var outside of loop 2014-12-16 17:00:35 +01:00
John McLear
cfa3f15f94 Merge pull request #2373 from webzwo0i/avoid-global-vairables 
dont make local variables global
 2014-12-16 00:41:41 +00:00
webzwo0i
5d15f655f0 dont make local variables global 2014-12-14 22:01:28 +01:00
John McLear
a2dbf8761f allow for timeslider custom messages 2014-12-10 01:23:24 +00:00
Simon Gaeremynck
45c1ad078b Allow for shardable Etherpad 2014-12-09 14:59:18 +00:00
John McLear
653cc6c87f this class was in before, it is used to show when a style is applied to a piece of content 2014-12-09 14:57:18 +00:00
John McLear
f11bdc1b44 also logic to add attributes for properties 2014-12-09 01:31:40 +00:00
John McLear
6080de9d79 Merge pull request #2348 from ether/sanitizer 
sanitizer change
 2014-12-04 17:31:42 +00:00
webzwo0i
22803da42f be more strict in checkRep 2014-12-04 16:12:13 +01:00
webzwo0i
10c2f72720 dont remove more lines than exist in the whole text 2014-12-04 16:01:39 +01:00
John McLear
c1fdd7ff79 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-01 15:10:17 +00:00
John McLear
c539cc7d6b styling of global view colum 2014-12-01 15:10:03 +00:00
John McLear
d7e980cd47 yet more minor css polish 2014-11-29 02:24:19 +00:00
John McLear
ed96c13a1f minor ui polish 2014-11-29 00:54:06 +00:00
John McLear
ee585f0457 color picker on mobile actually shows on screen 2014-11-29 00:32:37 +00:00
John McLear
34f7625739 a little more polish 2014-11-29 00:30:13 +00:00
John McLear
53887db872 mobile ui polish 2014-11-29 00:26:25 +00:00
John McLear
a642deaa72 gritter css fix 2014-11-28 02:25:21 +00:00
John McLear
68979e1212 better fix 2014-11-28 00:35:46 +00:00
John McLear
e6d85bbe69 fix issue with top of chatbox not being aligned properly 2014-11-28 00:26:34 +00:00
John McLear
d974e881a8 Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer 2014-11-28 00:02:16 +00:00
John McLear
3ca48ed975 fix undo in chrome etc 2014-11-27 16:49:08 +00:00
John McLear
2c728b8e1b sanitizer change 2014-11-27 00:45:22 +00:00
John McLear
e51ab2db24 fix for #2132 2014-11-26 23:37:44 +00:00
John McLear
60d44cd3df use cheerio instead of jsdom 2014-11-25 17:26:09 +00:00
John McLear
555d22245d Merge pull request #2335 from ether/javascript-bower 
swap out jquery browser for bower but expose browser object to all pages...
 2014-11-23 14:15:41 +00:00
John McLear
0eb7cc7864 Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc 2014-11-23 14:14:11 +00:00
John McLear
5f2e830b72 whoopsi 2014-11-22 19:13:23 +00:00
John McLear
9b66c93d6b swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well 2014-11-22 19:11:35 +00:00
John McLear
488d6890f9 minor styling 2014-11-21 00:15:55 +00:00
John McLear
ff9a2a687f whoops fix animation not to look broken 2014-11-19 18:27:55 +00:00
John McLear
28c7b666c1 correct file links 2014-11-19 00:24:14 +00:00
John McLear
16d8068d7d Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons 2014-11-19 00:17:01 +00:00
John McLear
9aea689438 move tiny bit of font awesome we actually use into pad.css 2014-11-19 00:16:08 +00:00
John McLear
f5dcc374ba slight ui fix 2014-11-18 23:15:56 +00:00
John McLear
e821cb13fa more polish 2014-11-18 22:47:20 +00:00
John McLear
95cb721914 clean up 2014-11-18 22:41:00 +00:00
John McLear
09b08e5a72 working pause 2014-11-18 22:29:46 +00:00
John McLear
e2410e41b0 more polish 2014-11-18 22:24:16 +00:00
John McLear
a06f01c04a some timeslider styling but this wont be completed by me 2014-11-18 22:21:36 +00:00
Beau Gunderson
645ec830b0 Don't crash on bad plugins.json; fixes #2323 2014-11-18 13:59:36 -08:00
John McLear
4a12eec3e0 a font lookup file 2014-11-18 21:10:40 +00:00
John McLear
9712f852e9 remove connecting bar image 2014-11-18 19:16:50 +00:00
John McLear
9b5ee93bce spinning loading icons 2014-11-18 19:13:51 +00:00
John McLear
3ad9a58895 fontello config file 2014-11-18 18:47:12 +00:00
John McLear
21ce9b4dd3 correct font stuff 2014-11-18 18:44:45 +00:00
John McLear
c14e1696b3 remove stuff, new files 2014-11-18 18:09:29 +00:00
John McLear
d10013c159 client side code now fixed 2014-11-18 14:10:38 +00:00
John McLear
020b636b1f template of a semi-fix 2014-11-18 14:08:44 +00:00
Simon Gaeremynck
d7a181be67 Nooping console.foo in html10n.js when the method is not defined. 2014-11-15 16:31:19 +00:00
John McLear
fc79c8a298 Merge pull request #1912 from ether/hide-chat-when-caret-behind 
Hide Chat Icon when the Caret is on the same line
 2014-11-15 16:13:53 +00:00
John McLear
eff4863a22 Merge pull request #2290 from ether/IE11-null-password 
change to proper IE check
 2014-11-15 15:37:53 +00:00
John McLear
12914e68ff Merge pull request #2294 from ether/go-away-npm 
Use request and a remote ep plugin only endpoint
 2014-11-15 15:37:44 +00:00
John McLear
8d2fa35b3f Merge pull request #2298 from ether/reflow-toolbar-properly 
Reflow toolbar properly
 2014-11-15 15:37:28 +00:00
John McLear
a52743d8f1 Merge pull request #2282 from ether/chrome-paste 
Chrome browser change wrapping type
 2014-11-13 13:00:32 +00:00
John McLear
e5d77c3763 indentation 2014-11-12 21:39:03 +00:00
John McLear
07d29a5d7a Merge pull request #2219 from Gared/fix_css 
Fix position of import/export popup in timeslider
 2014-11-12 15:18:25 +00:00
Prateek Saxena
2d597a4cab Add keyboard shortcut to Clear Authorship Colors. Fixes #2292 2014-11-07 14:01:32 +05:30
John McLear
fc5152c2f3 remove logging 2014-11-06 17:38:38 +00:00
John McLear
d13b6162f0 this looks way better 2014-11-06 15:50:55 +00:00
John McLear
0685e563ed working on resize 2014-11-06 15:43:21 +00:00
John McLear
96d6e7c1b7 cleaner reflow 2014-11-06 15:12:40 +00:00
John McLear
9170effb27 working redraw and draw on startup 2014-11-06 15:09:44 +00:00
John McLear
7d04d7309f reflow buttons based on browser size, much better 2014-11-06 14:32:20 +00:00
John McLear
c7061e47db use request and a remote ep plugin only endpoint 2014-11-04 17:06:47 +00:00
John McLear
b59f6a4d6f Update ace2_inner.js 2014-11-04 15:50:53 +00:00
John McLear
a22b558a2c change to proper IE check 2014-11-01 20:21:48 +00:00
John McLear
9b8398d0bd Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-11-01 20:20:19 +00:00
John McLear
d54bb52b75 Fixes #1414 
https://github.com/ether/etherpad-lite/issues/1414
 2014-11-01 18:18:25 +00:00
John McLear
bf380eea50 take line breaks and treat them appropriatly instead of creating a space for them.. 2014-11-01 18:07:34 +00:00
John McLear
ac2e949c3e chrome browser change wrapping type 2014-10-24 00:13:34 +01:00
Prateek Saxena
6f5f89bc6b Use 'evt.shiftKey' instead of matching 'charCodes' 
The shortcut wasn't running consistently and was blocking
'Cmd+L' on Chrome 38. Instead of going to the location bar
it would tooggle the list. Strangely, it did not override
'Cmd+N'. Using `evt.shiftKey` instead of matching the `charCode`
to the uppercase letter solves the problem.
 2014-10-14 18:37:35 +05:30
Prateek Saxena
ca32ac89b6 Add a subset of FontAwesome icons using Fontello 
Most of the code here has been taken from @LaKing's #2554.

Only icons required for etherpad have been added. Here is a
list of the code points that are being used:

 0xe800 0xe801 0xe802 0xe803
 0xe804 0xe805 0xe806 0xe807
 0xe808 0xe809 0xe80a 0xe80b
 0xe80c 0xe80d 0xe80e 0xe80f
 0xe810 0xe811 0xe812 0xe813
 0xe814 0xe815 0xe816 0xe817

Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css

Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.

This is the first step for #2253
 2014-10-14 09:16:44 +05:30
Prateek Saxena
7b8953ee75 Add keyboard shortcuts for ordered and unordered lists and update tooltips #1987 
Ordered List: Ctrl-Shift-N
Unordered List: Ctrl-Shift-L
 2014-10-12 17:40:57 +05:30
Prateek Saxena
001d75cd1e Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987 
A quick search revealed that 'Ctrl-5' is a popular shortcut
for strikethrough. Implemented in 'ace2_inner' and updated
the English l10n file for the tooltip.
 2014-10-11 22:51:20 +05:30
John McLear
0962f65c08 I prefer this.. 2014-10-06 14:23:13 +01:00
John McLear
f0c12d3884 escape useragent before displaying 2014-10-06 14:18:54 +01:00
John McLear
fb940897ee Merge pull request #2257 from 0ip/fix/user-count 
Fix broken user count
 2014-10-05 12:42:52 +01:00
0ip
29f8f13423 Prevent selection on buttons 2014-10-05 13:35:20 +02:00
0ip
5008ad10c6 Fix user count 
Still dirty, but really works.
 2014-10-05 13:14:07 +02:00
0ip
ee68d43932 Fix import/export popup margin @ timeslider 2014-10-03 17:39:15 +02:00
0ip
12c1d3b05a Fix active button ui 2014-10-03 17:35:48 +02:00
Stefan
0d95c8d1ec Revert change on position of imp/exp overlay 2014-09-14 20:26:35 +02:00
Stefan
cf6e5aa3ca Fix click on timeslider loads two different revisions 2014-08-09 18:56:18 +02:00
Stefan
bb21759d78 Fix timeslider revision not changing in most cases 2014-08-09 18:52:44 +02:00
Stefan
287a7805c9 Fix position of import/export popup in timeslider 2014-08-09 14:05:04 +02:00
Mike DeRosa
7861cae763 Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready). 
Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.
 2014-07-12 16:27:00 -04:00
Mike DeRosa
070ba40f4f Fallback for browsers that don't support window.history.pushstate 2014-07-06 18:22:24 -04:00
kpn3m000
da0fe98edc Fixes search on plugins without Description 
example "tables_ssl"
 2014-07-03 14:24:41 +02:00
John McLear
2ee4e9e7fd change to line 73 2014-06-28 15:19:28 +01:00
John McLear
b657676bdd gah can only do 1/2 a fix 2014-06-24 19:02:40 +01:00
John McLear
25ace65374 don't lose comment 2014-06-24 18:46:41 +01:00
John McLear
db045c6ffd CSS fix for pasting plain-text in chrome, needs thorough testing 2014-06-24 18:45:54 +01:00
Mike DeRosa
4ccd7131d3 Added function to switch to a different pad without having to reload the whole page. 2014-06-14 14:25:56 -04:00
luto
f70309645c pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage 2014-06-12 13:33:17 +02:00
Marcel Klehr
46ef83d710 Fix #online_count 
Rather dirty, but works.
 2014-04-30 22:32:08 +02:00
John McLear
706ee1f866 fix color 2014-04-15 18:11:41 +01:00
Marcel Klehr
6b5e3ea3a5 Toolbar: Fix timeslider button 
Wouldn't play nice with url params in document.location
fixes #2124
 2014-03-31 20:50:01 +02:00
Marcel Klehr
80e45e1192 Fix redo toolbar command, again. 2014-03-30 13:05:51 +02:00
Marcel Klehr
6054cda473 Create a customizable timeslider toolbar 2014-03-30 13:02:41 +02:00
Marcel Klehr
867e40533a Fix timeslider export dropdown 2014-03-30 12:30:18 +02:00
John McLear
54bf17bfea fix error on focus remove from import/export 2014-03-29 13:32:34 +00:00
John McLear
e23af7e439 changelog, package file and fix for redo 2014-03-26 15:44:04 +00:00
John McLear
e1fa43e640 quick formatting clean up 2014-03-17 19:20:32 +00:00
Marcel Klehr
51900cbf67 Toolbar: Allow custom dropdowns for plugins 2014-03-16 14:04:12 +01:00
Marcel Klehr
a369347d86 Merge branch 'pr/1579' into toolbar-test 
Conflicts:
	settings.json.template
	src/static/js/pad_editbar.js
 2014-03-16 13:30:22 +01:00
John McLear
cc03f5374c Merge pull request #2089 from dmitryuv/changesetslib-fixes 
fix for infinite loop on bad changeset
 2014-03-13 14:39:19 +00:00
John McLear
e12093eb19 Merge pull request #2080 from ether/ignore-ctrl-pageup 
allow tabs to be cycled when focus is in editor
 2014-03-13 00:49:20 +00:00
John McLear
f5716a3b26 cleaner logic 2014-03-05 21:44:32 +00:00
John McLear
89d7ba0dc0 merge 2014-03-05 21:27:12 +00:00
John McLear
432438a40d fix dintenation 2014-03-04 23:36:16 +00:00
John McLear
c3d62c5fa4 preprocessor for domline attributes 2014-03-04 23:14:15 +00:00
Marcel Klehr
af50001769 Merge pull request #2074 from webzwo0i/fix-disconnect-on-new-changes-in-padinitialization 
don't call ace_getInInternationalComposition if editor is not fully load...
 2014-02-26 22:52:30 +01:00
Dmitry Uvarov
0e6019344e fix for infinite loop on bad changeset 2014-02-20 14:08:49 +04:00
Benjamin Chodoroff
44062ae765 escape rendered npm package info 2014-02-17 11:40:30 -05:00
John McLear
7151e7827a allow tabs to be cycled when focus is in editor 2014-02-01 07:05:25 +00:00
webzwo0i
3f31445abf don't call ace_getInInternationalComposition if editor is not fully loaded 2014-01-28 14:07:26 +01:00
Marcel Klehr
b6f354a2de Merge pull request #2052 from ether/fix/l10n-fallbacks-related-langs 
Try to find related languages as a fallback
 2014-01-25 05:34:11 -08:00
Marcel Klehr
fd4dd915ce Merge pull request #2062 from Gared/enable_import_buttons 
Fix #1835 Enable import buttons after failed import (timeout)
 2014-01-24 08:26:37 -08:00
Gared
bf6ec18ead Fix #1835 Enable import buttons after failed import (timeout) 2014-01-19 20:04:09 +01:00
Gared
3715535f86 Fix #2058 Add square brackets to url characters 2014-01-19 19:23:11 +01:00
Marcel Klehr
9c64b6e268 Try to find related languages as a fallback 
fixes #2029
 2013-12-30 13:06:13 +01:00
John McLear
333d2f119b expose update browser selection function 2013-12-18 22:13:03 +00:00
John McLear
1a138438eb dont error when pressing del on rep 0 0 2013-12-18 18:34:35 +00:00
John McLear
8313083cd9 better handling for attribute queries 2013-12-17 20:48:19 +00:00
Grant Woodford
17666eaef7 Changed to not use inline JavaScript 2013-12-15 12:02:43 +02:00
John McLear
24e96c4f8b Merge pull request #2028 from webzwo0i/remove-deadcode 
Remove deadcode
 2013-12-09 10:49:57 -08:00
John McLear
505dc70df5 Merge pull request #2013 from ether/getAttributeOnSelection 
getAttributeOnSelection function
 2013-12-09 09:46:57 -08:00
webzwo0i
77cf2aafac [pad_modals] remove unused variables. for the hide/show functions jquery's default variables are used everywhere 2013-12-08 17:35:11 +01:00
webzwo0i
9400425b1e [virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused 2013-12-08 17:33:58 +01:00
webzwo0i
ab797c9831 [pad_connectionstatus] padeditbar is not used anywhere in pad_connectionstatus 2013-12-08 17:31:46 +01:00
webzwo0i
906ab1820b [timeslider] do not include underscore, as its not (longer) used 2013-12-08 17:31:18 +01:00
webzwo0i
1fa8c2a7e6 [collab_client] remove unused function getStats 2013-12-08 17:30:48 +01:00
webzwo0i
6aaf4c4065 [collab_client] remove keys function, which was not used and variable reconnectTimes which was used for some long gone disconnect tracking code 2013-12-08 17:30:25 +01:00
webzwo0i
aadcfbb3d1 do not send globalPadId in clientvars - its not used anywhere 2013-12-08 17:29:41 +01:00
webzwo0i
021db28a02 [Changeset] a?lines_length was not used within inverse function 2013-12-08 17:27:48 +01:00
webzwo0i
e04f46d477 [ace2_inner] init() has replaced setup(), reflect this change in the comments and remove the unused setup() 2013-12-08 17:25:12 +01:00
webzwo0i
020bd3915c remove empty&unused overlaysdiv 2013-12-08 17:24:12 +01:00
webzwo0i
4dd3584532 [ace2inner] remove unused function boldColorFromColor 2013-12-08 17:22:55 +01:00
webzwo0i
a714f63597 [ace2inner] remove unused recolorLineByKey that was part of old recolor module 2013-12-08 17:22:20 +01:00
webzwo0i
3dc844eb08 [ace2_inner] remove unused getLineKeyForOffset that was part of old recolor module 2013-12-08 17:21:53 +01:00
webzwo0i
eee355979d [ace2_inner] remove unused function htmlForRemovedChild 2013-12-08 17:21:27 +01:00
webzwo0i
8175af3017 [collab_client] remove socketid because its not used 2013-12-08 17:20:53 +01:00
webzwo0i
f25fed1c25 [ace2_inner] remove incorpIfQuick because its unused since July 2013-12-08 17:15:38 +01:00
John McLear
8a547b24ba resolve issue where first char showed all formatting 2013-12-07 17:37:52 +00:00
Marcel Klehr
37442d301c Merge pull request #2021 from ldidry/fix-no-tab-indent 
Replace tabs indentation with spaces indentation
 2013-12-05 06:22:33 -08:00
Luc Didry
3d8452b143 Replace tabs indentation with spaces indentation 
Some files are obviously external libraries, I didn't touch them
 2013-12-05 08:41:29 +01:00
John McLear
378e07964b allow for lighter colors 2013-12-04 23:01:08 +00:00
John McLear
30f577e8f4 dont assume formatting is on the start of any line 2013-12-01 20:01:17 +00:00
John McLear
95db100f12 remove white space 2013-12-01 18:56:05 +00:00
John McLear
39f81fdb9e remove post ace event 2013-12-01 18:55:42 +00:00
John McLear
3791ad4186 ends of line shouldn't show incorrect formatted status 2013-12-01 18:54:46 +00:00
John McLear
b4877f002d handle logic for line lengths with 0 2013-12-01 18:06:56 +00:00
Grant Woodford
d1367484e3 Added a way to closed the extended chat window 2013-11-28 21:53:00 +02:00
Grant Woodford
383a216a7d Added a way to closed the extended chat window 2013-11-28 21:48:08 +02:00
John McLear
e9f7583793 some nice css to that reflect when a button is active 2013-11-28 17:44:37 +00:00
John McLear
dee2dab7c4 getAttributeOnSelection function 2013-11-28 17:27:52 +00:00
s1341
7550be0921 strip off trailing commas 2013-11-26 10:11:32 +02:00
John McLear
3be1ee5967 slightly cleaner 2013-11-25 17:36:24 +00:00
John McLear
252be19885 make sticky chat mroe responsive to changes in top bar 2013-11-25 17:33:33 +00:00
Marcel Klehr
5d803a0523 Fix walking caret bug 
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
 2013-11-22 17:18:30 +01:00
Grant Woodford
c3a58f42e7 Added a better way of detecting when a url does not have a protocol specified 2013-10-21 22:15:46 +02:00
Marcel Klehr
8c9e543b91 Fix disconnect modals 2013-10-12 22:29:03 +02:00
Marcel Klehr
7f10b9a42f Add explanations for more disconnect scenarios 2013-10-10 21:11:15 +02:00
Marcel Klehr
22e9e5fdcd Merge pull request #1926 from ether/fix/no-connect-to-corrupt-pad 
Fix a whole range of bugs related to corrupted changesets
 2013-10-10 11:07:37 -07:00
Marcel Klehr
46511d6144 Polish the error messages of the easysync lib 2013-10-10 20:02:13 +02:00
Marcel Klehr
ccf4683558 Easysync: Throw an error if an unknown attrib is referneced 2013-10-10 16:38:16 +02:00
John McLear
6dc4240985 Merge pull request #1919 from ether/make-username-show-properly 
use val not value, broken with newer jq
 2013-10-02 16:37:29 -07:00
John McLear
d69df91709 use val not value, broken with newer jq 2013-10-03 00:36:15 +01:00
John McLear
716e929e64 works but hides caret on full line and not on X too, X is much harder to do 2013-09-29 08:19:57 +01:00
John McLear
6e4d94069f Merge pull request #1906 from ether/down-arrow-dont-be-weird 
Down arrow dont be weird
 2013-09-28 23:38:45 -07:00
John McLear
7d1d73f8a6 doh, wasnt supposed to add this background 2013-09-25 22:20:13 +01:00
John McLear
ed04842801 more sensible reload without cache message 2013-09-25 22:18:51 +01:00
John McLear
c8109b7398 sanity also control home support 2013-09-25 15:56:56 +01:00
John McLear
487f1a969f vast improvement on movement of caret due to isolation of cause of problem - TLDR is Chrome detects blank rows line heights as incorrect 2013-09-25 14:57:02 +01:00
Marcel Klehr
6a02302fc9 /admin/plugins: Fix search algorithm (use string match in lower case) 
fix #1903
 2013-09-23 19:55:35 +02:00
John McLear
e35c45e9b5 make export clearly seperated from import 2013-09-21 16:22:43 +01:00
John McLear
ca680a32b6 fix padding so export icons show properly 2013-09-21 16:17:19 +01:00
John McLear
05a8ae7acc padding on import now button 2013-09-21 16:15:59 +01:00
Guillaume AMAT
96adb4d626 The #importsubmitinput button was too small and hidden its value 2013-09-21 12:39:45 +02:00
Guillaume AMAT
6de3a400e1 The import/export columns were not displayed correctly 2013-09-21 12:38:26 +02:00
daniel tygel
1cfde05139 fix .popup CSS to fit in small spaces, like thin iframe 2013-09-17 11:26:11 -06:00
Marcel Klehr
2b46bc40a1 Beautify infinite scroll 2013-09-12 16:37:37 +02:00
Florent Viard
6f478c4de1 Fix to check if searchTerm is not "undefined" before trying to use it to filter search results. 
Signed-off-by: Florent Viard <fviard@lacie.com>
 2013-09-11 11:36:09 +02:00
Marcel Klehr
c39eb4f443 Make use of the new plural macro 2013-07-23 12:43:30 +02:00
Marcel Klehr
dabba91152 Update html10n.js 2013-07-23 12:42:55 +02:00
Dave Longley
3a47e719d4 Make pads with long lines usable with chrome. 
- Do not use incorpIfQuick on keyup because it's not ever quick
  on chrome. Calling incorpIfQuick calls incorporateUserChanges
  which sets a flag on the current callstack state indicating
  that the selection has changed (since something was typed).
  Whenever this flag is set, the event handler will run code
  to update the selection (and possibly scroll the view as
  well), which is a very costly operation in webkit browsers.
  Instead let the user changes be incorporated by the idle worker,
  scheduling it to run ASAP on keyup. This isn't a perfect
  solution, but may make pads running on webkit browsers more
  usable with otherwise fairly unnoticeable changes in the UI.
 2013-07-14 01:51:39 -04:00
j@mailb.org
9dd6471921 Add userLeave hook 2013-06-17 15:53:01 +02:00
j@mailb.org
bc5dc74f90 pass pad in postAceInit hook 
no way for plugins to access current pad otherwise.
 2013-06-17 15:52:51 +02:00
j@mailb.org
a554552bed Simpify CSS for sticky chat 2013-06-17 14:47:28 +02:00
John McLear
ae78c6731d Merge pull request #1811 from clkao/author-style-hook 
Document author style hook and provide outer_ace dynamic css manager
 2013-06-15 00:17:09 -07:00
Chia-liang Kao
f31db205da allow cssmanager to manage outer_ace 2013-06-15 01:38:46 +08:00
Kyle Kelley
82de797642 Only kept URL schemes which have an RFC standard 2013-06-12 12:31:38 -05:00
Kyle Kelley
b4f155c028 Cleanup gophers 2013-06-12 11:20:36 -05:00
Chia-liang Kao
548f31a46a new hook: aceSetAuthorStyle 2013-06-06 13:03:40 +08:00
Chia-liang Kao
eae9faa28c refactor setAuthorStyle 2013-06-06 12:30:48 +08:00
Marcel Klehr
90d1598688 Merge pull request #1751 from goldquest/dev_IE8-fix 
Fixing IE8 errors
 2013-05-08 07:19:15 -07:00
Brian Emerick
e7d8f124ad Issue #1625: Fix to client-side-induced changeset spamming. 
THE BUG - HIGH LEVEL:
- When client A sends out an attribute change, client B applies that change to itself but
  also thinks that it made the change itself, which is incorrect. This means that when client B
  next makes a change, he will send out that he made the attrib change that A actually made.
- Ex: Have 2 clients on the same pad. Have A apply bold on some text. Next, have B type a character.
  B will broadcast that it both added a character AND applied bold, when in reality it did NOT
  apply bold at all, that change was done by the other client and this client incorrectly adopted it as its own.
- This root bug behavior results in clients continuing to think that they each made the other client's change,
  thus resulting in an infinite loop of changeset spamming that bogs down clients and harms server stability.

THE BUG - IN DEPTH:
- The root issue is in the way that Changesets are combined in Changeset.follow(). Specifically, in the case of a
  changeset with ONLY new attrib changes (no text changes) being merged with an identity changeset (has no ops).
- In this case, Changeset.follow() copies the ops of the new CS and fully overrides the other CS.
- applyChangesToBase invokes Changeset.follow to determine the final client document CS state after applying the new CS.
  If the final client document CS state is NOT the identity CS, then the client broadcasts that it made a change.
- When client A changes just attribs, client B's applyChangesToBase calls Changeset.follow() and passes client A's
  changeset (attrib change) and Client B's current changeset state (identity).
- As per the noted bug, Changeset.follow() returns client A's changeset as a result, causing client B to adopt
  client A's changeset as its own document state. Thus, client A ends up thinking it has made client B's changes.

THE FIX:
- Changeset.follow() should NOT copy the ops of the new CS passed in if those changes are only attrib changes.
  This allows applyChangesToBase to properly set the client's CS back to the identity after applying an
  external attrib change, instead of incorrectly adopting the external client's changes.
 2013-04-24 15:18:25 -07:00
goldquest
98c43aff43 fixed spacing 2013-04-17 18:17:14 +02:00
John McLear
f478f99995 Merge pull request #1750 from ether/fix/authorship-once-and-4-all 
Fix authorship sanitization
 2013-04-17 08:13:22 -07:00
goldquest
896f72311f use document, not doc 2013-04-17 16:51:54 +02:00
goldquest
566034ddf0 IE8 don't knows the Array.forEach function (simple version fix) 2013-04-17 16:51:43 +02:00
goldquest
b08a6e522f IE8 complains, if catch block is missing 2013-04-17 16:51:21 +02:00
Marcel Klehr
146c75e703 Remove console.log in content collector 
fixes #1731
 2013-04-17 16:37:45 +03:00
Marcel Klehr
560fd55bf2 Fix authorship sanitization 
author colors wouldn't get disttributed, if their id was greater than 9
(due to apool encoding them to base 36)
 2013-04-17 15:24:40 +02:00
cohitre
602380abb7 passing the ToolbarItem to the callback 2013-04-15 16:06:32 -07:00
cohitre
0c52fb5e30 Normalizing how select and button commands are triggered. 2013-04-15 11:32:59 -07:00
John McLear
4989f56673 undo avoid changeset spam as it breaks functionality 2013-04-15 14:36:25 +01:00
John McLear
c3c7a3d128 Merge pull request #1721 from ether/dont-send-same-cs-spam 
temp patch for #1652
 2013-04-15 04:20:05 -07:00
cohitre
90837437c5 Moving the toolbar plugin calls. 2013-04-13 12:06:51 -07:00
John McLear
08b54ef61b Merge pull request #1732 from ether/authorID-2 
Correct authorID in Changeset on modification
 2013-04-12 06:36:39 -07:00
John McLear
337179fddd remove console logs and cruft 2013-04-12 14:34:07 +01:00
Marcel Klehr
f4de7f6a90 Use a string instead of an array! 2013-04-11 21:23:38 +02:00
Marcel Klehr
49013b18c7 We need to replace all new author attribs with thisSession.author, in case someone copy/pasted or otherwise inserted other peoples changes 2013-04-11 21:12:59 +02:00
John McLear
f9d23767f8 Merge pull request #1709 from ether/keep-list-order-on-paste 
When you paste into a numbered list, keep some integrity
 2013-04-11 09:07:22 -07:00
John McLear
dc6e2e13fe Merge pull request #1723 from ether/expose-broadcastslider 
expose broadcast slider so plugins can interact with it
 2013-04-11 09:03:43 -07:00
Marcel Klehr
594757cc47 html10n.js: Don't break in getDirection if language hasn't been set 
fixes #1724
 2013-04-11 18:51:49 +03:00
John McLear
9581097dc7 remove cruft 2013-04-11 16:39:25 +01:00
John McLear
1fc906017c final css 2013-04-11 16:38:41 +01:00
John McLear
e712f7665d working solution props to dmitryu for making me not be scared of modifying div clases 2013-04-11 16:33:03 +01:00
Marcel Klehr
c755633f09 Update html10n.js to correctly use the console.log shim 
fixes #1724
 2013-04-10 17:56:09 +02:00
John McLear
8836981e32 expose broadcast slider so plugins can interact with it 2013-04-09 15:55:14 +01:00
John McLear
90c5b26e89 keep integrity on paste and better styling but new lists dont reset counter 2013-04-09 14:29:55 +01:00
John McLear
2e76bd4e50 working but then create a second list, it will be stupid, SIGH 2013-04-09 01:22:09 +01:00
John McLear
7885c410b5 Merge branch 'develop' of github.com:ether/etherpad-lite into keep-list-order-on-paste 2013-04-09 00:52:04 +01:00
John McLear
bfa233ba04 kudos to quenenni for some working CSS 2013-04-09 00:46:13 +01:00
John McLear
70a25964b6 make sure elements are supported, still doesn't assign numbers properly 2013-04-08 23:32:04 +01:00
John McLear
49cff88a48 semi working 2013-04-08 23:03:19 +01:00
John McLear
7098ba49f3 Merge pull request #1722 from mluto/remove-top-console-log-in-collab-client 
use `parent.parent` instead of `top` in `collab_client.js`
 2013-04-08 14:09:36 -07:00
mluto
dfc49df52d use parent.parent instead of top in collab_client.js, since top breaks embedding when a pad is embedded (same origin policy) 2013-04-08 22:58:34 +02:00
John McLear
bf93500214 some polish for a turd 2013-04-08 19:50:52 +01:00
John McLear
946289c221 temp patch for 1652 2013-04-08 19:46:45 +01:00
John McLear
7728d5b321 remove draggable which was used for dragging users in the userbox 2013-04-08 17:23:03 +01:00
John McLear
12bc98af7e Merge pull request #1716 from ether/only-redraw-existing-lines 
only try to redraw the line height of lines that exist..
 2013-04-08 08:44:48 -07:00
Marcel Klehr
324b9b1f5f pluginfw/installer: Only restart the server when all tasks have finished 
fixes #1685
 2013-04-08 16:14:03 +02:00
John McLear
f135f79d13 only try to redraw the line height of lines that exist.. 2013-04-07 19:06:15 +01:00
John McLear
ffc8f61a2f remove cruft 2013-04-07 18:44:13 +01:00
John McLear
12a2da2884 attempting to get right client authorid sent with changeset 2013-04-07 18:40:55 +01:00
Marcel Klehr
402a4b7b3e html10n.js: Finally fix two-part locale specs 
fixes #1706
 2013-04-05 14:18:46 +02:00
John McLear
883be3d48d begin by adding some template css 2013-04-05 02:21:56 +01:00
John McLear
380821781f dont use top, use the scheduler 2013-04-04 02:25:19 +01:00
mluto
c5b4e4934d Kick the user if has already successfully authenticated but his session became invalid later 2013-04-03 11:19:26 +02:00
John McLear
56275d8de7 longer timeout on reconnection 2013-04-02 12:20:38 -07:00
mluto
1793e93ea1 Decode the sessionID before sending it to the server since our separator ',' gets encoded 2013-03-31 11:30:01 +02:00
John McLear
6a5e5cb6fd Merge pull request #1640 from ether/caret-refactor 
Caret refactor - I need help with tests...
 2013-03-30 09:21:35 -07:00
John McLear
f1b60e9867 Merge pull request #1677 from ether/ctrl-s-fade 
show light yellow for .5 secs on save revision keypress
 2013-03-28 20:11:30 -07:00
John McLear
c67c7ca746 remove messy bits 2013-03-29 03:09:10 +00:00
Marcel Klehr
0ff5137da3 Make revision button glow on ctrl-s and increase duration 2013-03-28 16:39:33 +01:00
John McLear
59a9ff404d more settimeout to top window 2013-03-28 13:18:55 +00:00
John McLear
c489177206 show light yellow for .5 secs on save revision keypress 2013-03-28 02:24:59 +00:00
John McLear
09b32ea694 Merge pull request #1672 from ether/feature/admin-plugins-revamp 
/admin/plugins revamp
 2013-03-27 12:05:00 -07:00
John McLear
2abb993e8b Merge pull request #1607 from ether/custom-obj-msg 
Custom Object messages
 2013-03-27 11:50:56 -07:00
Marcel Klehr
cbee50d42d /admin/plugins: Display a tooltip when hovering the plugin details link 2013-03-27 12:28:54 +01:00
Marcel Klehr
bc8d6d4c45 /admin/plugins: Add a loading indicator to some messages 2013-03-27 12:20:50 +01:00
Marcel Klehr
c4d9a71156 /admin/plugins: Fix update check 2013-03-27 12:02:19 +01:00
John McLear
cee1ead8f6 Merge pull request #1664 from ether/sticky-chat 
Option to enable Sticky chat from the chat dialogue
 2013-03-26 13:12:01 -07:00
Marcel Klehr
d01a209cbf /admin/plugins: Dry up displaying of info messages 2013-03-26 21:04:21 +01:00
Marcel Klehr
76c879bb47 /admin/plugins: Fix for smaller screens 2013-03-26 20:41:24 +01:00
Marcel Klehr
806926d0f6 /admin/plugins: If a user installs sth scroll up to the loading indicator 2013-03-26 19:54:23 +01:00
Marcel Klehr
4edb3b7ab3 /admin/plugins: Fix infinite scroll for larger screens 2013-03-26 19:32:15 +01:00
Marcel Klehr
2393dcd652 Disable search until registry is loaded and fix sorting by version 
... and always display a scrollbar.
 2013-03-26 19:22:04 +01:00
Marcel Klehr
f75a839cd0 Remove plugin prefix in pluin lists and make links to plugins more clear 2013-03-26 18:39:46 +01:00
Marcel Klehr
7edfff7574 /admin/plugins: Show some text if nothing is display otherwise 2013-03-26 16:23:47 +01:00
Marcel Klehr
638cea5fd6 Install and uninstall plugins with style 
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile

Why? http://i.imgur.com/XoX6uYS.jpg
 2013-03-26 15:11:30 +01:00
Marcel Klehr
981a33f01e pluginfw/installer.js fire callbacks only once 2013-03-26 14:40:19 +01:00
Marcel Klehr
aca5d150e4 /admin/plugins: Don't list installed plugins as available 2013-03-26 11:58:31 +01:00
Marcel Klehr
511407241a /admin/plugins: Make it display the same amount of plugins after sorting 2013-03-26 11:38:51 +01:00
Marcel Klehr
5d7a8adcb7 Silence npm when using npm.commands.search 2013-03-26 11:33:04 +01:00
Marcel Klehr
9109bd206e Catch all errors in pluginfw/installer.js 2013-03-26 11:20:12 +01:00
Marcel Klehr
e8bae61cf5 /admin/plugins: Add progress indicators and report errors 2013-03-26 11:19:36 +01:00
John McLear
6b55d13370 expose ace document, reqjired for various plugins 2013-03-26 01:54:01 +00:00
Marcel Klehr
b35d9c14fd /admin/plugins:Hide ep_etherpad-lite in the list of installed plugins 2013-03-25 23:52:10 +01:00
Marcel Klehr
773293991b admin/plugins: Allow people to sort search results 2013-03-25 23:09:03 +01:00
Marcel Klehr
1ebbcd2f30 Don't leak event listeners in pluginfw/installer.js 
fixes #921
 2013-03-25 17:22:51 +01:00