Commit Graph

2132 Commits (9e9207d8b6091375017aba122eb8c3db0fb10e8a)

Author SHA1 Message Date
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 64034ee1c6 doh caps 2015-03-31 18:50:50 +01:00
John McLear 48862dac6f better handling for inputs and left and right arrows 2015-03-31 18:50:20 +01:00
John McLear 37c7c7eabe i18n for timeslider steppers 2015-03-31 17:06:04 +01:00
John McLear 662216b6cf slightly different alt stuff 2015-03-31 16:36:44 +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 ec1956b4b6 read for button activity 2015-03-26 12:42:07 +00:00
John McLear 4362a42f7f make index page accessible for screen readers 2015-03-26 11:38:55 +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
Simon Gaeremynck 9bde17b91c Bumped ueberDB to 0.2.14 so Cassandra suport is included 2015-03-22 12:27:54 +00:00
Thomas Muehlichen a3f07c1048 fixes #2556 (error toggling line attribute) and clarified method documentation (AttributeManager.toggleAttributeOnLine) 2015-03-20 11:58:56 +01:00
webzwo0i a0fb65205c oops, fix export with wildcards 2015-03-14 00:02:23 +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
webzwo0i f249b42ab4 empty author should be allowed to support clearAuthorship functionality 2015-03-03 16:39:14 +01:00
webzwo0i 0693c0ae97 - operator do not show up in the attribs of a pad, but authors could still leak to the pool 2015-03-03 15:37:56 +01:00
webzwo0i 01cd82427a check author in = operator 2015-03-03 15:20:33 +01:00
webzwo0i 0f82cd8711 print revision numbers - not changesets - in warn-log 2015-03-02 11:14:24 +01:00
webzwo0i 683c9dfb7c callback with argument error in async.series instead 2015-03-02 11:05:33 +01:00
John McLear 4e0353b3ef bump ueber 2015-03-02 08:59:53 +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 152f51aeab Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-count
Fixes #1870
2015-02-27 12:03:03 +00:00
webzwo0i 7719117e1e do not crash when encountering mismatched compositions. log the changesets and padid 2015-02-26 14:57:49 +01:00
John McLear 38a4f1be5f bump ueberdb 2015-02-26 12:14:01 +00:00
John McLear 178309e10d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-26 12:13:41 +00:00
Luc Didry 92022e493e Add backend tests for new API functions
These new functions are:
* getSavedRevisionsCount
* listSavedRevisions
* saveRevision

+ typo fixing in backend tests
2015-02-25 01:05:58 +01:00
Luc Didry 845788c39d Add a saveRevision API function
Calling saveRevision create an author which name is "API"
2015-02-25 01:04:27 +01:00
Luc Didry a08c50a77d Fixes #1870
Add two functions to API :
 * getSavedRevisionsCount
 * listSavedRevisions
2015-02-24 23:42:35 +01:00
John McLear 1c044588e6 mobile stylings for chat always on screen 2015-02-22 17:56:44 +00:00
John McLear 470b0ba2a6 Merge pull request #2520 from ether/load-testing-settings
allow for load testing connections to hit by a setting
2015-02-22 14:41:09 +00:00
John McLear d5bec1701e fix export of bad pads and also limit import to files 2015-02-21 12:33:30 +00:00
Siebrand Mazeland abb9b6d833 Localisation updates from https://translatewiki.net. 2015-02-19 13:02:42 +01:00
John McLear ec6a2b5ba9 allow for load testing connections to hit by a setting 2015-02-16 23:02:19 +00:00
webzwo0i 37924e441a add try-catch clause around calls to applyToAText 2015-02-16 09:01:30 +01:00
webzwo0i c9a5167b41 throw in applyToText and not in applyToAText 2015-02-16 06:27:18 +01:00
webzwo0i 59328aa33a Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of"
This reverts commit 66582b19e7.
2015-02-16 06:22:49 +01:00
webzwo0i 83e1bf0dc4 add semicolons 2015-02-16 03:33:57 +01:00
webzwo0i 66582b19e7 51c14d9947 changed the return value of
applyToText to an array that includes if there was an error in the
newline part of an changeset op.
easysync_tests need to know this too
2015-02-15 16:21:07 +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 e39b442840 bump v for #2505 fix 2015-02-13 01:25:29 +00:00
John McLear d0caebc21f may aswell make the git sha a link to the commit 2015-02-11 18:05:01 +00:00
John McLear ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00: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
Mike DeRosa 4c6bd37286 Adding api call for appending a chat message. 2015-02-09 00:18:12 -05: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 b9802616b6 use latest cleanCSS 2015-02-04 17:57:34 +00:00
John McLear 9afcd89167 bump versions to see if it's stable 2015-02-04 17:52:27 +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 a9910c741e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-27 19:41:09 +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
Siebrand Mazeland 78c3a8d65b Localisation updates from https://translatewiki.net. 2015-01-26 22:58:30 +01:00
John McLear b6e7ddf874 bump v 2015-01-26 16:11:15 +00:00
John McLear 4de42da2e3 Merge pull request #2497 from ether/image-support-hook
clean support for image hook
2015-01-26 16:07:56 +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
Stefan 4c64b7a670 Revert 'asyncLineHTMLForExport' hook 2015-01-25 22:08:40 +01:00
John McLear aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear 831151cfba Merge pull request #2487 from ether/html-e-hook
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
2015-01-25 00:07:34 +00:00
John McLear f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00
John McLear c798a27ad8 boop 2015-01-24 13:39:45 +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
John McLear 85c5cc80d0 Merge pull request #2488 from webzwo0i/fix-session-without-auth-crash
Stop processing a message without auth (i.e. a client did not send
2015-01-24 13:15:58 +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
webzwo0i 6b0cf29af6 Stop processing a message without auth (i.e. a client did not send
CLIENT_READY)
2015-01-24 06:34:41 +01:00
John McLear 1890ba3976 working, might need polish its pretty late 2015-01-24 05:14:38 +00:00
John McLear 9abb85799c realization how aCallAll works 2015-01-24 04:31:50 +00:00
John McLear 372063295f beginning of a hook, needs docs etc 2015-01-24 04:09:13 +00:00
John McLear 5dce72d419 chrome list handling fix for #2412 2015-01-23 01:47:12 +00:00
John McLear 6fd0285d4d include lineContent in hok 2015-01-21 21:36:11 +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 aee0fd797d working translation 2015-01-21 16:11:00 +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 7237a3b7cc bump ueberdb 2015-01-21 14:58:47 +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 cb65224997 better logic for author handling 2015-01-21 00:28:00 +00:00
John McLear 5f9bbd0666 restrict expor4t to only expose this pad ID 2015-01-21 00:03:39 +00:00
John McLear 531d25ab84 freeze deps 2015-01-20 23:50:55 +00:00
John McLear 84638a39b7 Merge pull request #2469 from ether/new-sethtml-tests
I need to do some more work on this at some point..  Leaving here
2015-01-19 15:51:37 +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
John McLear 4ab4c9998b Merge pull request #2470 from cetra3/timeslider_proxy_fix
Timeslider proxy fix
2015-01-19 13:32:03 +00:00
Siebrand Mazeland 28aeeff154 Localisation updates from https://translatewiki.net. 2015-01-19 09:28:03 +01: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