fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,328 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

4328 Commits

Author SHA1 Message Date
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
John McLear 17db8ed4a4 Merge pull request #2561 from simong/ueberdb-cassandra 
Bumped ueberDB to 0.2.14 so Cassandra suport is included
 2015-03-22 16:30:31 +01:00
Simon Gaeremynck 9bde17b91c Bumped ueberDB to 0.2.14 so Cassandra suport is included 2015-03-22 12:27:54 +00:00
John McLear f2e5dce6fa Merge pull request #2559 from tm-linkwerk/fix-2556-attributemanager 
fixes #2556 error toggling line attribute; clarified documentation
 2015-03-21 18:15:58 +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
Stefan 6c933a1296 Merge pull request #2553 from ether/master 
Merge branch master back to develop
 2015-03-15 15:27:35 +01:00
Stefan b9cdf4352b Merge pull request #2552 from ether/release/1.5.2 
Release/1.5.2
 2015-03-15 14:51:27 +01:00
Stefan c0260bcc40 Add changelog for v1.5.2 2015-03-15 14:28:47 +01:00
John McLear d991dab8b2 Merge pull request #2550 from webzwo0i/fix-export-leak 
oops, fix export with wildcards
 2015-03-13 23:34:05 +00:00
webzwo0i a0fb65205c oops, fix export with wildcards 2015-03-14 00:02:23 +01:00
John McLear ec7ff3a0ca Merge pull request #2548 from lid2000/patch-1 
Return true from handleCut function
 2015-03-13 10:51:25 +00: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 547046830e actually disconnect should NOT be visible... 2015-03-03 16:51:18 +01:00
webzwo0i f249b42ab4 empty author should be allowed to support clearAuthorship functionality 2015-03-03 16:39:14 +01:00
webzwo0i 393a4e54e5 recognize reconnect in clear_authorship_colors test 2015-03-03 16:17:39 +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
John McLear cc0eaba7e2 Merge pull request #2533 from cjb/issue-2514-renumber-on-cut 
Trigger renumbering when deleting (via cut) the first item of a list
 2015-02-27 22:07:08 +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 768b012e8b Merge pull request #2525 from ldidry/fix-doc-api-number 
Set correct API version in doc
 2015-02-22 22:11:11 +00:00
Luc Didry 4166f19078 Set correct API version in doc 
The doc says current version is 1.2.9, but there is getPadID which uses 1.2.10 API.
 2015-02-22 22:32:18 +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
John McLear 0900eb5105 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-16 12:28:42 +00:00