summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-03Merge new release into master branch!HEADmasterStefan
2018-02-03Release version 1.6.3Stefan
2018-02-03Added missing require for is-var-nameStefan
2018-01-31Merge pull request #3313 from rhelmer/sanitize-window-locationJohn McLear
better sanitize window location in error messages
2018-01-31Merge pull request #3314 from rhelmer/sanitize-jsonpJohn McLear
better sanitize jsonp
2018-01-30better sanitize jsonpRobert Helmer
2018-01-30better sanitize window location in error messagesRobert Helmer
2018-01-29Localisation updates from https://translatewiki.net.translatewiki.net
2018-01-25Localisation updates from https://translatewiki.net.translatewiki.net
2018-01-22Localisation updates from https://translatewiki.net.translatewiki.net
2018-01-18Localisation updates from https://translatewiki.net.translatewiki.net
2018-01-04Select formatting button on selection (#3301)Joas Souza
[feat] Select button when selection is on formatted text
2018-01-03Add settings to scroll on edition out of viewport (#3282)Joas Souza
* Add scroll when it edits a line out of viewport By default, when there is an edition of a line, which is out of the viewport, Etherpad scrolls the minimum necessary to make this line visible. This makes that the line stays either on the top or the bottom of the viewport. With this commit, we add a setting to make possible to scroll to a position x% pixels from the viewport. Besides of that, we add a setting to make an animation of this scroll. If nothing is changed on settings.json the Etherpad default behavior is kept
2018-01-01Localisation updates from https://translatewiki.net.translatewiki.net
2017-12-28Localisation updates from https://translatewiki.net.translatewiki.net
2017-12-21Localisation updates from https://translatewiki.net.translatewiki.net
2017-12-07Localisation updates from https://translatewiki.net.translatewiki.net
2017-12-04Update package.jsonJohn McLear
2017-11-23Localisation updates from https://translatewiki.net.translatewiki.net
2017-11-20Update package.jsonJohn McLear
2017-11-20Localisation updates from https://translatewiki.net.translatewiki.net
2017-11-16Localisation updates from https://translatewiki.net.translatewiki.net
2017-11-09Localisation updates from https://translatewiki.net.translatewiki.net
2017-11-06Localisation updates from https://translatewiki.net.translatewiki.net
2017-11-04Catch SIGTERM for graceful shutdown (#3266)Rainer Rillke
Shut down database connection and exit the node process when SIGTERM is encountered. This is especially important when nodejs is run as PID1, e.g. in a docker container. Shutting down connections to clients (browsers) is beyond this patche's scope. Resolves #3265
2017-11-04Merge new release into master branch!Stefan
2017-11-04Updated CHANGELOG.mdStefan (Gared)
2017-11-04Merge new release into master branch!Stefan
2017-11-04Release version 1.6.2Stefan (Gared)
2017-11-04Fix #3111 updating request to 2.83.0Stefan (Gared)
2017-11-04Updated node version for windows to 8.9.0Stefan (Gared)
2017-11-02Localisation updates from https://translatewiki.net.translatewiki.net
2017-10-23Localisation updates from https://translatewiki.net.translatewiki.net
2017-10-19Localisation updates from https://translatewiki.net.translatewiki.net
2017-10-12Merge pull request #3223 from HairyFotr/patch1Stefan
Typos and other minor fixes
2017-10-12Merge pull request #3241 from djmaze/fix-socket-io-crashStefan
Update socket.io to 1.7.3
2017-10-12Localisation updates from https://translatewiki.net.translatewiki.net
2017-09-21Allow 'placeholder' to be a localizable attribute on HTML elements (#3257)Luiza Pagliari
2017-09-21Localisation updates from https://translatewiki.net.translatewiki.net
2017-09-14Typos and minor fixes in bin, doc, and rootHairyFotr
2017-09-11Localisation updates from https://translatewiki.net.translatewiki.net
2017-09-07Localisation updates from https://translatewiki.net.translatewiki.net
2017-08-31Localisation updates from https://translatewiki.net.translatewiki.net
2017-08-21Localisation updates from https://translatewiki.net.translatewiki.net
2017-08-17Localisation updates from https://translatewiki.net.translatewiki.net
2017-08-15Revert "[feat] Update l10n lib (#3248)" (#3249)Luiza Pagliari
This reverts commit 6bcaa00a4ba70320a390457c90dbf699d0e4a4b9.
2017-08-15[feat] Update l10n lib (#3248)Luiza Pagliari
Last update was from 2014. Fix #3244.
2017-08-14Localisation updates from https://translatewiki.net.translatewiki.net
2017-08-07Localisation updates from https://translatewiki.net.translatewiki.net
2017-08-04Update socket.io to 1.7.3Martin Honermeyer
That in turn upgrades engine.io to 1.8.2. This fixes a crash for me when running behind a traefik reverse proxy. https://github.com/socketio/engine.io/issues/465