summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-06bump ueberJohn McLear
2015-04-06bump vsJohn McLear
2015-04-04Merge pull request #2576 from rdubigny/developJohn McLear
Fix minor typo in installDeps.sh
2015-04-04Update installDeps.shRaphaël Dubigny
2015-04-04Update installDeps.shRaphaël Dubigny
2015-04-02Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-04-02fix for #2574John McLear
2015-04-01Merge pull request #2573 from ether/append-chat-apiJohn McLear
Append chat api -- includes tests.
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 #2477 from gabrielliwerant/develop-readme-instructionsJohn McLear
Add subdirectory installation instructions
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-31Merge pull request #2568 from ↵John McLear
tm-linkwerk/feature-2567-contentcollector-keyvalue-attributes Feature #2567 Added workaround to enable contentcollector to write key-v...
2015-03-31Merge pull request #2571 from LeoVerto/patch-1John McLear
Fix minor typo in safeRun.sh email report
2015-03-31Fix minor typo in safeRun.sh email reportLeoVerto
2015-03-31feature #2558 added documentationThomas Muehlichen
2015-03-31feature #2567 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-22Merge pull request #2561 from simong/ueberdb-cassandraJohn McLear
Bumped ueberDB to 0.2.14 so Cassandra suport is included
2015-03-22Bumped ueberDB to 0.2.14 so Cassandra suport is includedSimon Gaeremynck
2015-03-21Merge pull request #2559 from tm-linkwerk/fix-2556-attributemanagerJohn McLear
fixes #2556 error toggling line attribute; clarified documentation
2015-03-20fixes #2556 (error toggling line attribute) and clarified method ↵Thomas Muehlichen
documentation (AttributeManager.toggleAttributeOnLine)
2015-03-15Merge pull request #2553 from ether/masterStefan
Merge branch master back to develop
2015-03-15Merge pull request #2552 from ether/release/1.5.2Stefan
Release/1.5.2
2015-03-15Add changelog for v1.5.2Stefan
2015-03-13Merge pull request #2550 from webzwo0i/fix-export-leakJohn McLear
oops, fix export with wildcards
2015-03-14oops, fix export with wildcardswebzwo0i
2015-03-13Merge pull request #2548 from lid2000/patch-1John McLear
Return true from handleCut function
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-03actually disconnect should NOT be visible...webzwo0i
2015-03-03empty author should be allowed to support clearAuthorship functionalitywebzwo0i
2015-03-03recognize reconnect in clear_authorship_colors testwebzwo0i
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:29:37 +0000