Commit Graph

1174 Commits

Author SHA1 Message Date
John McLear 3944a0e79b more read only mode fixes andadd support for handleMessageSecurity hook 2015-05-20 01:05:53 +01:00
John McLear fe7ab21c84 dont allow chat input or name input on read only pads 2015-05-19 17:52:43 +01:00
John McLear 3b91b46baa always hide connected one second after connected 2015-05-10 11:46:49 +01:00
John McLear f5ccd3ce6d Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix
Bugfix innerText
2015-05-07 23:09:24 +01:00
John McLear debca84ebe Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys 2015-05-07 15:56:01 +00:00
John McLear 975bd99064 support for french stuff 2015-05-07 15:55:52 +00:00
Stefan Mintert 250afd0451 Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blob/WR-72-linebreak-cursorverhalten/static/hooks.js#L94 2015-05-07 16:47:14 +02:00
John McLear ee0368fd0f Merge pull request #2649 from xavidotron/develop
When using setText(), replace the entire existing text of the pad.
2015-05-06 16:37:07 +01:00
John McLear 361807e578 console msg should go to window 2015-05-06 00:36:42 +01:00
John McLear c903cb3925 fix alt c and escape 2015-05-06 00:32:36 +01:00
John McLear 363d5d06b7 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-05-05 20:41:58 +01:00
John McLear 48c2b7cde1 fixes #2570 2015-05-05 20:41:40 +01:00
Xavid 5e64c292a4 When using setText(), replace the entire existing text of the pad,
rather than replacing all except the last letter.
2015-05-05 14:18:27 -04:00
0ip 9b85b8dc98 Fix popup border 2015-05-04 22:18:34 +02:00
John McLear 0a9c631410 better fix for #2625 2015-05-01 20:44:36 +01:00
John McLear da06ac6fd7 dont prompt twice on import fool 2015-04-29 16:40:29 +01:00
Alexander Sulfrian 74ad7a8584 timeslider: Fix export links
Names of the pads can contain more charaters than \w. So while
transforming the export links, we simply can allow all charaters
except the slash as pad names.
2015-04-29 16:39:40 +02:00
John McLear ac41d150c0 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-28 23:42:11 +01:00
John McLear 1f471b0f81 show versions of plugins at startup, fixes #2642 2015-04-28 23:41:55 +01:00
John McLear 799b086216 Merge pull request #2641 from lpagliari/develop
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 23:05:39 +01:00
John McLear dbb2956d2f allow chrome to use control shift 1 to send ordered list 2015-04-28 15:48:12 +01:00
Luiza Pagliari 58ab17bf9e Fix the way Content Collector gets the node class. Fixes #2640 2015-04-28 05:31:07 -07:00
John McLear b349a4f226 probably fixes #2625 2015-04-23 17:49:08 +01:00
John McLear b8192fd015 first attempt at fixing dead keys, it cant be this easy can it? 2015-04-17 17:01:15 +01:00
John McLear 629f909d57 add some semicoolons to prevent chrome warning 2015-04-13 10:52:15 +01:00
John McLear 6a027d88a9 fix older IEs 2015-04-12 13:00:01 +01:00
John McLear 5435063a2f re-fix rtl 2015-04-12 10:35:24 +01:00
John McLear 8ed12c7776 session key is now ignored and also padOptions are available in settings 2015-04-11 21:22:00 +01:00
John McLear 27aa71f3a4 IE list fixes 2015-04-11 13:16:45 +01:00
John McLear 34c5441392 msg to self 2015-04-11 11:37:20 +01:00
John McLear 14fab9f441 FF middle click fix 2015-04-11 10:45:51 +01:00
John McLear 7b86eb09bc new fix for #1766 2015-04-08 09:24:19 +01:00
John McLear 7e99724fec Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-06 13:19:42 +01:00
John McLear e027083136 timeslider settings for fonts 2015-04-05 15:18:36 +01:00
John McLear 56ce8e80ac hacky fix for opendyslexic 2015-04-05 14:50:53 +01:00
John McLear 41bb4ef094 support for open dyslexic font 2015-04-05 14:03:09 +01:00
John McLear e49bb4017c use ctrl shift 2 instead of alt a 2015-04-05 13:42:26 +01:00
John McLear db0bcdd696 fix issue where focus on timeslider wouldnt work 2015-04-05 13:39:20 +01:00
John McLear f79e2c7de2 final accessibility for Timeslider hopefully 2015-04-03 12:29:47 +01:00
John McLear 139edceb66 Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 16:50:43 +01:00
John McLear 85fc012bac change to alt shit and a to show authors 2015-04-02 15:13:16 +01:00
John McLear 644536b27b fix for #2574 2015-04-02 13:16:49 +01:00
John McLear f6b4b5603d fix timeslider title issues 2015-04-02 00:03:34 +01:00
John McLear 0b90da19d2 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-03-31 23:32:15 +01:00
John McLear 70fdc7dcd7 Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection
Re-implement ace_getAttributeOnSelection
2015-03-31 23:21:49 +01:00
John McLear b6ff1807da Merge pull request #2482 from ether/chrome-list-handling
chrome list handling fix for #2412
2015-03-31 23:19:47 +01:00
John McLear 64a89a3ec0 Merge pull request #2541 from cristo-rabani/patch-3
fixed + support for value
2015-03-31 22:58:10 +01:00
John McLear 4397191f55 Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position
feature #2558 get attributes on position
2015-03-31 22:46:00 +01:00
John McLear e9d8c3b53a expose method for getting a full user list on the client including historical data 2015-03-31 20:26:55 +01:00
John McLear 48862dac6f better handling for inputs and left and right arrows 2015-03-31 18:50:20 +01:00
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