summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-02-03[fix] Fix drag and drop tests for IELuiza Pagliari
2017-02-02Merge pull request #3119 from storytouch/fix_3118Luiza Pagliari
2017-01-29Merge pull request #3131 from Sjord/remove-outdated-commentStefan
2017-01-26Remove deprecated commentSjoerd Langkemper
2017-01-17Merge pull request #3123 from Sjord/fix-hook-called-fromLuiza Pagliari
2017-01-17Update called from for two hooksSjoerd Langkemper
2017-01-12Merge pull request #3122 from tpltnt/freebsd-pkg-fixLuiza Pagliari
2017-01-12added curl as dependencytpltnt
2017-01-12[chore] Use helper plugin when running tests on TravisLuiza Pagliari
2017-01-12[fix] Consider line attribs of plugins when building changesetsLuiza Pagliari
2017-01-02Localisation updates from https://translatewiki.net.Niklas Laxström
2016-12-29Localisation updates from https://translatewiki.net.Niklas Laxström
2016-12-27Merge pull request #3106 from alxlo/developLuiza Pagliari
2016-12-26minor changes in docsAlexander Lorz
2016-12-23Merge pull request #3103 from ether/masterStefan
2016-12-23Update CHANGELOG.mdStefan
2016-12-23Merge new release into master branch!Stefan
2016-12-23Release version 1.6.1Stefan
2016-12-23Merge pull request #3101 from Gared/fix_crash_on_invalid_exportStefan
2016-12-22Update nodejs for windows to 6.9.2Stefan
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