summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-03-17quick formatting clean upJohn McLear
2014-03-16Refactor toolbar.js to use consistent namingMarcel Klehr
2014-03-16Toolbar: Allow custom dropdowns for pluginsMarcel Klehr
2014-03-16Merge branch 'pr/1579' into toolbar-testMarcel Klehr
Conflicts: settings.json.template src/static/js/pad_editbar.js
2014-03-14Sometimes, the author2session / group2session don't exist anymore, but the ↵goldquest
session does. It should be possible to delete a session, if they don't exist
2014-03-13Merge pull request #2089 from dmitryuv/changesetslib-fixesJohn McLear
fix for infinite loop on bad changeset
2014-03-13Merge pull request #2080 from ether/ignore-ctrl-pageupJohn McLear
allow tabs to be cycled when focus is in editor
2014-03-12Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-03-05cleaner logicJohn McLear
2014-03-05mergeJohn McLear
2014-03-04fix dintenationJohn McLear
2014-03-04preprocessor for domline attributesJohn McLear
2014-02-26Merge pull request #2095 from vvision/developMarcel Klehr
Fix plugins not being fetched (update npm)
2014-02-26Merge pull request #2074 from ↵Marcel Klehr
webzwo0i/fix-disconnect-on-new-changes-in-padinitialization don't call ace_getInInternationalComposition if editor is not fully load...
2014-02-24Updated npm version.vvision
2014-02-20fix for infinite loop on bad changesetDmitry Uvarov
2014-02-19Addressed a potential never finishing forEach in PadMessageHandler.padUsersSimon Gaeremynck
If the session info for a client would be null or undefined, the forEach callback would never get called which means the padUsers callback would never get trigged. This could potentially block API request as this function is exposed at an HTTP API endpoint.
2014-02-17escape rendered npm package infoBenjamin Chodoroff
2014-02-09Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-02-02Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-02-01allow tabs to be cycled when focus is in editorJohn McLear
2014-01-28don't call ace_getInInternationalComposition if editor is not fully loadedwebzwo0i
2014-01-25Merge pull request #2052 from ether/fix/l10n-fallbacks-related-langsMarcel Klehr
Try to find related languages as a fallback
2014-01-24Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-01-24Merge pull request #2062 from Gared/enable_import_buttonsMarcel Klehr
Fix #1835 Enable import buttons after failed import (timeout)
2014-01-24fix randomstringwebzwo0i
2014-01-19Fix #1835 Enable import buttons after failed import (timeout)Gared
2014-01-19Fix #2058 Add square brackets to url charactersGared
2014-01-15convert over to server-side cryptoRobert Helmer
2014-01-15new randomString function should take len argRobert Helmer
2014-01-15mozilla bug 844796 - use node crypto module for randomStringRobert Helmer
2014-01-11Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-01-06Localisation updates from https://translatewiki.net.Siebrand Mazeland
2013-12-30Try to find related languages as a fallbackMarcel Klehr
fixes #2029
2013-12-28Localisation updates from https://translatewiki.net.Siebrand Mazeland
2013-12-23Localisation updates from https://translatewiki.net.Siebrand Mazeland
2013-12-18expose update browser selection functionJohn McLear
2013-12-18dont error when pressing del on rep 0 0John McLear
2013-12-17Merge pull request #2041 from ether/fix-get-attrJohn McLear
better handling for attribute queries
2013-12-17better handling for attribute queriesJohn McLear
2013-12-17Don't crash if CHANGESET_REQ failsMarcel Klehr
2013-12-17Fix server side bug index overflows1341
The server wasn't properly checking that the changesets it needed to return for changeset_requests actually existed.
2013-12-17Localisation updates from https://translatewiki.net.Siebrand Mazeland
2013-12-16Merge pull request #1514 from ether/dont-die-on-bad-htmlJohn McLear
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-14Add input validation for html param in setHTML()Lennart Brinkmann
2013-12-10Merge branch 'fix-exporthtml-styling-tags' of ↵John McLear
https://github.com/webzwo0i/etherpad-lite into develop
2013-12-09resolve merge conflictJohn McLear
2013-12-09Merge pull request #2028 from webzwo0i/remove-deadcodeJohn McLear
Remove deadcode
2013-12-09Merge pull request #2030 from ether/import_hookJohn McLear
Working import hooks
2013-12-09Remove console logsJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 01:45:40 +0000