summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-04-06bump ueberJohn McLear
2015-04-06bump vsJohn McLear
2015-04-02Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-04-02fix for #2574John McLear
2015-04-01reintroduce removed api points that were removed by mistakeJohn McLear
2015-04-01tests and fix up sloppy code by original authorJohn McLear
2015-04-01Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite ↵John McLear
into append-chat-api
2015-03-31Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelectionJohn McLear
Re-implement ace_getAttributeOnSelection
2015-03-31Merge pull request #2482 from ether/chrome-list-handlingJohn McLear
chrome list handling fix for #2412
2015-03-31Merge pull request #2530 from ↵John McLear
webzwo0i/exception-handling-for-mimatched-composition do not crash when encountering mismatched compositions. log the changese...
2015-03-31Merge pull request #2538 from webzwo0i/check-author-attributionJohn McLear
Check author attribution and fix clearAuthorship test
2015-03-31Merge pull request #2541 from cristo-rabani/patch-3John McLear
fixed + support for value
2015-03-31Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-positionJohn McLear
feature #2558 get attributes on position
2015-03-31feature #2558 added documentationThomas Muehlichen
2015-03-26Feature #2567 Added workaround to enable contentcollector to write key-value ↵Thomas Muehlichen
attributes
2015-03-25feature #2558 more precise documentationThomas Muehlichen
2015-03-25feature #2558 added functions to get all attributes at the current or an ↵Thomas Muehlichen
abritrary position
2015-03-24own listcristo-rabani
2015-03-24disable cut renumbering of OLs so cut paste worksJohn McLear
2015-03-24temp fix for cut paste but might break some OL functionalityJohn McLear
2015-03-22fixcristo-rabani
2015-03-22Bumped ueberDB to 0.2.14 so Cassandra suport is includedSimon Gaeremynck
2015-03-20fixes #2556 (error toggling line attribute) and clarified method ↵Thomas Muehlichen
documentation (AttributeManager.toggleAttributeOnLine)
2015-03-14oops, fix export with wildcardswebzwo0i
2015-03-13Return true from handleCut functionlid2000
2015-03-06fixed + support for valueCristo
2015-03-04a should always have white space pre-wrap stops caret walking in chrome on themJohn McLear
2015-03-03empty author should be allowed to support clearAuthorship functionalitywebzwo0i
2015-03-03- operator do not show up in the attribs of a pad, but authors could still ↵webzwo0i
leak to the pool
2015-03-03check author in = operatorwebzwo0i
2015-03-02print revision numbers - not changesets - in warn-logwebzwo0i
2015-03-02callback with argument error in async.series insteadwebzwo0i
2015-03-02bump ueberJohn McLear
2015-02-27Trigger renumbering when deleting (via cut) the first item of a listChris Ball
Fixes #2514.
2015-02-27Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-countJohn McLear
Fixes #1870
2015-02-26do not crash when encountering mismatched compositions. log the changesets ↵webzwo0i
and padid
2015-02-26bump ueberdbJohn McLear
2015-02-26Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-02-25Add backend tests for new API functionsLuc Didry
These new functions are: * getSavedRevisionsCount * listSavedRevisions * saveRevision + typo fixing in backend tests
2015-02-25Add a saveRevision API functionLuc Didry
Calling saveRevision create an author which name is "API"
2015-02-24Fixes #1870Luc Didry
Add two functions to API : * getSavedRevisionsCount * listSavedRevisions
2015-02-22mobile stylings for chat always on screenJohn McLear
2015-02-22Merge pull request #2520 from ether/load-testing-settingsJohn McLear
allow for load testing connections to hit by a setting
2015-02-21fix export of bad pads and also limit import to filesJohn McLear
2015-02-19Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-02-16allow for load testing connections to hit by a settingJohn McLear
2015-02-16add try-catch clause around calls to applyToATextwebzwo0i
2015-02-16throw in applyToText and not in applyToATextwebzwo0i
2015-02-16Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of"webzwo0i
This reverts commit 66582b19e7a196b77df1e9a912db020189a93014.
2015-02-16add semicolonswebzwo0i