summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-12-22Fixed crash on invalid export urlStefan
2016-12-20Merge pull request #2993 from ether/fixes-2945Stefan
2016-12-20Merge pull request #3053 from danfuzz/fix-timeslider-listsStefan
2016-12-20Merge pull request #3000 from Gared/improve_cookiesStefan
2016-12-20Try to init cookies before testing if it existsStefan
2016-12-20Merge branch 'develop' into improve_cookiesStefan
2016-12-20Merge pull request #3084 from Gared/fix_npm_node7Stefan
2016-12-19Localisation updates from https://translatewiki.net.Niklas Laxström
2016-12-15Localisation updates from https://translatewiki.net.Niklas Laxström
2016-12-13Merge pull request #2929 from xavidotron/developLuiza Pagliari
2016-12-12Merge pull request #3085 from Gared/fix_socketio_optionsStefan
2016-11-30Merge pull request #3086 from Gared/update_node_for_windowsStefan
2016-11-24Localisation updates from https://translatewiki.net.Niklas Laxström
2016-11-20Updated socket.io to 1.6.0Stefan
2016-11-20Updated node for windows build to version 6.9.1Stefan
2016-11-20Updated option parameters for socket.io to work with latest versionStefan
2016-11-20Updated npm to 4.0.2 and removed recursive searching for ep-pluginsStefan
2016-11-17Localisation updates from https://translatewiki.net.Siebrand Mazeland
2016-11-16Merge pull request #3080 from ldidry/document-undocumented-API-function-resto...Luiza Pagliari
2016-11-16Add undocumented API function restoreRevision to docLuc Didry
2016-11-14Merge pull request #3077 from pcarver/typo-fixLuiza Pagliari
2016-11-11Correct the spelling of occured to occurredPaul Carver
2016-11-01Localisation updates from https://translatewiki.net.Niklas Laxström
2016-10-17Localisation updates from https://translatewiki.net.Niklas Laxström
2016-10-13Localisation updates from https://translatewiki.net.Niklas Laxström
2016-10-06Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-30Merge pull request #3044 from rugk/patch-3Stefan
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-09Handle relative paths properly, when `@import`ing.Dan Bornstein
2016-09-09Harmonize list- and indent-related CSS in the pad editor and timeslider.Dan Bornstein
2016-09-09Handle `@import` during CSS minification.Dan Bornstein
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-22Merge pull request #3042 from storytouch/fix_dndLuiza Pagliari