summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2016-09-30Merge https://github.com/ether/etherpad-lite into patch-3rugk
2016-09-28Merge pull request #3059 from paper-pauper/librejsJohn McLear
2016-09-27Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-22Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-20Added LibreJS supportNobody Really
2016-09-15Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-13Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-08Merge pull request #3045 from danfuzz/extract-export-cssLuiza Pagliari
2016-09-08Remove unused parameter `noDocType`.Dan Bornstein
2016-09-08Remove the `noDocType` argument, which was only ever passed as `false`.Dan Bornstein
2016-09-08Merge pull request #3048 from danfuzz/fix-first-line-margin-topLuiza Pagliari
2016-09-08Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-05Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-30Account for any top margin on the first line.Dan Bornstein
2016-08-25Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-24Use an EEJS template for HTML export instead of inlining it in the JS code.Dan Bornstein
2016-08-23Index: No-referrerrugk
2016-08-23Pad: Add no-referrerrugk
2016-08-23Timeslider: Add no-referrerrugk
2016-08-22Perform drag and drop in one changeset, so UNDO works properly. Fix #3041Luiza Pagliari
2016-08-18Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-15Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-04Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-01Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-28Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-25Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-21Fix #2918. Re-enable editor after user is reconnected to serverLuiza Pagliari
2016-07-18Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-07Localisation updates from https://translatewiki.net.Niklas Laxström
2016-06-28Merge pull request #2970 from xavidotron/urlJohn McLear
2016-06-22Merge pull request #3008 from Gared/directory_checkJohn McLear
2016-06-22Localisation updates from https://translatewiki.net.Siebrand Mazeland
2016-06-20Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEventsJohn McLear
2016-06-20Localisation updates from https://translatewiki.net.Niklas Laxström
2016-06-20Fixed path checkStefan
2016-06-16Localisation updates from https://translatewiki.net.Niklas Laxström
2016-06-13Merge pull request #2991 from LokeshN/deactivate-settingsJohn McLear
2016-06-13Localisation updates from https://translatewiki.net.Niklas Laxström
2016-06-07Merge pull request #2957 from ether/dependency_updatesStefan
2016-06-07Merge pull request #2986 from Gared/fix_existssync_deprecatedStefan
2016-06-06Localisation updates from https://translatewiki.net.Niklas Laxström
2016-05-26Localisation updates from https://translatewiki.net.Niklas Laxström
2016-05-22Issue #2960 - deactivate settings.jsonLokeshN
2016-05-20heh whoops :)John McLear
2016-05-20client Var value for disabling scriptsJohn McLear
2016-05-19Localisation updates from https://translatewiki.net.Niklas Laxström
2016-05-16Use fs.statSync instead of fs.existsSync (deprecated)Stefan
2016-05-12Localisation updates from https://translatewiki.net.Niklas Laxström
2016-05-06Remove [ and ] from the regexp used by the URL filter.Xavid
2016-05-02Updated several dependencies to latest versionStefan