Commit Graph

1174 Commits

Author SHA1 Message Date
John McLear 498e7f4961 MVP of alt A behavior to show author of line 2015-03-31 16:12:05 +01:00
John McLear 24e6e1728a I came to bring the rain.. Let me get my coat... Fix focus on timeslider import export 2015-03-31 15:00:43 +01:00
John McLear 73073dcbc1 Timeslider accessibility and Bugfixes 2015-03-31 14:47:00 +01:00
John McLear 0f0a6c73ac make user list a document so it's easy to navigate by screen readers 2015-03-31 14:11:49 +01:00
John McLear 3126d7196e fix alt and focus issues 2015-03-31 14:06:02 +01:00
John McLear ef38bcad9f make buttons i18n friendly and a better experience 2015-03-31 13:57:18 +01:00
John McLear 35948989b3 make Alt C and Alt F9 and Escape work from anywhere 2015-03-31 13:45:11 +01:00
John McLear a82e692bdd dont use nasty settimeouts use a callback instead for focus 2015-03-31 13:21:41 +01:00
Thomas Muehlichen a930161cb9 feature #2558 added documentation 2015-03-31 10:58:47 +02:00
John McLear f9071aebe6 fix issue with showControls false not working 2015-03-30 14:56:35 +01:00
Thomas Muehlichen 1c05933dc9 Feature #2567 Added workaround to enable contentcollector to write key-value attributes 2015-03-26 18:49:35 +01:00
John McLear 19e83d5405 much better chat focus toggle behavior 2015-03-26 16:58:13 +00:00
John McLear 428b547d24 alt c to focus on chat and gritter and chat both now work with aria 2015-03-26 16:44:22 +00:00
John McLear 548cef7018 more keyboard support while in editbar 2015-03-26 14:26:21 +00:00
John McLear 6b88c037b8 fix firefox button styling 2015-03-26 14:11:37 +00:00
John McLear 7b726cbc02 more working logic and also pretty nice screen reader experience 2015-03-26 13:58:57 +00:00
John McLear 959aa92656 stop listing URL each time focus is placed back on inner iframe 2015-03-26 13:32:45 +00:00
John McLear 1a5ea8707f make the pad contents act like an application and not contents, this can probably be togglable but default state should be editable 2015-03-26 13:16:54 +00:00
John McLear 69f0392e75 escape to exit editbar 2015-03-26 11:24:06 +00:00
John McLear e67ae522e2 support drop down show events 2015-03-25 23:30:17 +00:00
John McLear aff802a0b3 whoops 2015-03-25 21:15:44 +00:00
John McLear e9360b6ed2 working f9 logic 2015-03-25 15:49:41 +00:00
John McLear bc760e9494 logic to send focus back to pad on Alt F9 when focus on editbar 2015-03-25 15:38:19 +00:00
John McLear 0c902ced73 better logic for handling lr arrows 2015-03-25 15:19:52 +00:00
Thomas Muehlichen fbcbc3c8a2 feature #2558 more precise documentation 2015-03-25 13:29:03 +01:00
John McLear c6cac53dda remove console log 2015-03-25 12:25:49 +00:00
John McLear be73e729d4 remove console log 2015-03-25 12:25:33 +00:00
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