summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-05cleaner logicJohn McLear
2014-03-05docsJohn 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-26Merge pull request #2088 from simong/padUsersCallbackMarcel Klehr
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
2014-02-24Updated npm version.vvision
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-17Merge pull request #2086 from bnchdrff/cleanse-npm-valuesJohn McLear
escape rendered npm package info
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-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-24Merge pull request #2068 from webzwo0i/fix-randomstringMarcel Klehr
fix randomstring
2014-01-24fix randomstringwebzwo0i
2014-01-19Fix #1835 Enable import buttons after failed import (timeout)Gared
2014-01-19Merge pull request #2061 from Gared/url_square_bracketsJohn McLear
Fix #2058 Add square brackets to url characters
2014-01-19Fix #2058 Add square brackets to url charactersGared
2014-01-15Merge pull request #2060 from rhelmer/bug844796-session-token-generationJohn McLear
Bug844796 session token generation
2014-01-15convert over to server-side cryptoRobert Helmer
2014-01-15new randomString function should take len argRobert Helmer
2014-01-15Merge pull request #2059 from rhelmer/bug844796-session-token-generationJohn McLear
mozilla bug 844796 - use node crypto module for randomString
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-18Merge pull request #2045 from ether/exposeUpdateBrowserSelJohn McLear
expose update browser selection function
2013-12-18expose update browser selection functionJohn McLear
2013-12-18Merge pull request #2044 from ether/ff-del-firstcharJohn McLear
dont error when pressing del on rep 0 0
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-17Merge pull request #2039 from ether/fix/dont-crash-on-failed-changeset_reqJohn McLear
Don't crash if CHANGESET_REQ fails
2013-12-17Don't crash if CHANGESET_REQ failsMarcel Klehr
2013-12-17Merge pull request #2038 from s1341/fix/server_not_checking_changeset_req_boundsJohn McLear
Server doesn't check bounds on CHANGESET_REQ arguments
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-16Merge pull request #2035 from lebrinkma/dont-die-on-bad-htmlJohn McLear
Add input validation for html param in setHTML()
2013-12-14Add input validation for html param in setHTML()Lennart Brinkmann
2013-12-14Remove duplicate doc entry for setHTML()Lennart Brinkmann
2013-12-12Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2013-12-10Merge pull request #2032 from webzwo0i/fix-exporthtml-styling-tagsJohn McLear
Fix exporthtml styling tags
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 14:50:36 +0000