summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-07-21Merge pull request #3026 from storytouch/developLuiza Pagliari
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-15Merge pull request #3009 from storytouch/selectMultipleLinesOnFESpecsLuiza Pagliari
2016-07-07Localisation updates from https://translatewiki.net.Niklas Laxström
2016-06-28Merge pull request #2970 from xavidotron/urlJohn McLear
2016-06-27Add a frontend test for URLs followed by a ].Xavid
2016-06-22Merge pull request #3008 from Gared/directory_checkJohn McLear
2016-06-22Localisation updates from https://translatewiki.net.Siebrand Mazeland
2016-06-21Select beginning of end line when offset is 0 on frontend testsLuiza Pagliari
2016-06-21Enable multi-line selection on frontend testsLuiza Pagliari
2016-06-20Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEventsJohn McLear
2016-06-20Include usage example for aceRegisterNonScrollableEditEventsLuiza Pagliari
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-12Merge pull request #2999 from Gared/readme_change_supported_versionsStefan
2016-06-12Merge pull request #2998 from Gared/fix_db_migrate_scriptStefan
2016-06-08Change description in README for supported node versionsStefan
2016-06-08Fix module paths for db migration scriptStefan
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-16Merge pull request #2987 from Gared/fix_space_in_pathStefan
2016-05-16Fix error if whitespace in etherpad pathStefan
2016-05-16Use fs.statSync instead of fs.existsSync (deprecated)Stefan
2016-05-14Merge pull request #2961 from xiemaisi/fix-2951Stefan
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-05Fix useless comparison in sussonsAndGroups test.Max Schaefer
2016-05-02Updated several dependencies to latest versionStefan
2016-05-02Localisation updates from https://translatewiki.net.Niklas Laxström
2016-04-26Update socket.io to version 1.4.5Stefan
2016-04-24Merge pull request #2953 from ether/masterStefan
2016-04-24Add version 1.6.0 changelogsStefan
2016-04-24Merge pull request #2952 from ether/masterStefan
2016-04-24Merge new release into master branch!Stefan
2016-04-24Release version 1.6.0Stefan
2016-04-24Update node for windows to version 4.4.3Stefan
2016-04-24Remove node version output on startStefan
2016-04-18Localisation updates from https://translatewiki.net.Niklas Laxström
2016-04-11Localisation updates from https://translatewiki.net.Niklas Laxström
2016-04-09include the padIdJohn McLear