Commit Graph

5098 Commits (aba1c6f8bd0558de82b4303dc55775d8c74843c5)

Author SHA1 Message Date
John McLear f8e7a24f5e
Merge pull request #3321 from mmosemmle/jsonp_fix
Fix jsonp checking
2018-02-08 16:19:04 +00:00
Man Yue Mo a2992b3624 fix jsonp checking. 2018-02-07 08:43:07 +00:00
Stefan 0c9475e366
Merge pull request #3316 from ether/release/1.6.3
Release version 1.6.3
2018-02-03 13:01:24 +01:00
Stefan 89ad3cb809
Merge new release into master branch! 2018-02-03 12:57:42 +01:00
Stefan 1e25e7fc77 Release version 1.6.3 2018-02-03 12:57:22 +01:00
Stefan b292e137ed Added missing require for is-var-name 2018-02-03 12:33:33 +01:00
John McLear a03422b094
Merge pull request #3313 from rhelmer/sanitize-window-location
better sanitize window location in error messages
2018-01-31 08:25:59 +00:00
John McLear 626e58cc5a
Merge pull request #3314 from rhelmer/sanitize-jsonp
better sanitize jsonp
2018-01-31 08:25:43 +00:00
Robert Helmer f56936c936 better sanitize jsonp 2018-01-30 12:52:19 -08:00
Robert Helmer 38b1e0a35e better sanitize window location in error messages 2018-01-30 12:51:53 -08:00
translatewiki.net d7c93b0c0d Localisation updates from https://translatewiki.net. 2018-01-29 09:05:18 +01:00
translatewiki.net 832855cc21 Localisation updates from https://translatewiki.net. 2018-01-25 05:17:41 +01:00
translatewiki.net 281b211332 Localisation updates from https://translatewiki.net. 2018-01-22 15:03:53 +01:00
translatewiki.net a16bc9cd3a Localisation updates from https://translatewiki.net. 2018-01-18 08:31:51 +01:00
Joas Souza 454f539561 Select formatting button on selection (#3301)
[feat] Select button when selection is on formatted text
2018-01-04 12:28:00 -02:00
Joas Souza f1fcd16894 Add settings to scroll on edition out of viewport (#3282)
* 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-03 19:57:28 -02:00
translatewiki.net 291f700376 Localisation updates from https://translatewiki.net. 2018-01-01 15:26:09 +01:00
Avery Pennarun e0582797f2 Call authentication hooks before default basic authentication.
This allows authenticators to do any extra session setup for a given user,
even if their username/password happens to match settings.json.
2017-12-31 12:32:50 +00:00
translatewiki.net 6ecc1c3895 Localisation updates from https://translatewiki.net. 2017-12-28 08:55:45 +01:00
translatewiki.net d797344f56 Localisation updates from https://translatewiki.net. 2017-12-21 08:27:40 +01:00
translatewiki.net 924545525f Localisation updates from https://translatewiki.net. 2017-12-07 08:58:49 +01:00
John McLear bb11d014ab
Update package.json 2017-12-04 20:06:58 +00:00
Loïck Magniez 38cbff11a1 Adapted the padding due to the font-size modification 2017-11-23 16:24:08 +01:00
translatewiki.net 781b643775 Localisation updates from https://translatewiki.net. 2017-11-23 07:34:14 +01:00
Loick Magniez 54e834194b Changed the color palette and changed the pad's font size to 16px 2017-11-22 16:04:17 +01:00
John McLear ad09e8ed76
Update package.json 2017-11-20 08:46:24 +00:00
translatewiki.net c0f74cac5d Localisation updates from https://translatewiki.net. 2017-11-20 09:07:26 +01:00
translatewiki.net 69f0560529 Localisation updates from https://translatewiki.net. 2017-11-16 10:54:04 +01:00
translatewiki.net d519714914 Localisation updates from https://translatewiki.net. 2017-11-09 08:09:41 +01:00
translatewiki.net 407d95868b Localisation updates from https://translatewiki.net. 2017-11-06 09:00:43 +01:00
Rainer Rillke f12debd5c7 Catch SIGTERM for graceful shutdown (#3266)
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-04 19:59:19 -02:00
Stefan 32027134cb Merge new release into master branch! 2017-11-04 17:40:13 +01:00
Stefan (Gared) e84c696225 Updated CHANGELOG.md 2017-11-04 17:38:59 +01:00
Stefan fc77e3b564 Merge new release into master branch! 2017-11-04 17:24:45 +01:00
Stefan (Gared) baa372763c Release version 1.6.2 2017-11-04 17:24:29 +01:00
Stefan (Gared) e7b72f2234 Fix #3111 updating request to 2.83.0 2017-11-04 17:17:58 +01:00
Stefan (Gared) e347f12c71 Updated node version for windows to 8.9.0 2017-11-04 17:02:25 +01:00
translatewiki.net 097c07adec Localisation updates from https://translatewiki.net. 2017-11-02 08:12:10 +01:00
translatewiki.net 266b4a6a51 Localisation updates from https://translatewiki.net. 2017-10-23 04:59:18 +02:00
translatewiki.net 8c85205a80 Localisation updates from https://translatewiki.net. 2017-10-19 09:01:31 +02:00
Stefan 72438ef2c8 Merge pull request #3223 from HairyFotr/patch1
Typos and other minor fixes
2017-10-12 23:20:14 +02:00
Stefan c85ffd663e Merge pull request #3241 from djmaze/fix-socket-io-crash
Update socket.io to 1.7.3
2017-10-12 23:12:19 +02:00
translatewiki.net bb80085c9a Localisation updates from https://translatewiki.net. 2017-10-12 08:36:19 +02:00
Luiza Pagliari 0e1414dcca Allow 'placeholder' to be a localizable attribute on HTML elements (#3257) 2017-09-21 17:49:33 -03:00
translatewiki.net 67439545a6 Localisation updates from https://translatewiki.net. 2017-09-21 09:21:11 +02:00
HairyFotr c7548450c0
Typos and minor fixes in bin, doc, and root 2017-09-14 13:33:27 +02:00
translatewiki.net 3f875a56e3 Localisation updates from https://translatewiki.net. 2017-09-11 07:16:33 +02:00
translatewiki.net 457fdaa360 Localisation updates from https://translatewiki.net. 2017-09-07 07:17:26 +02:00
translatewiki.net a0aedd6793 Localisation updates from https://translatewiki.net. 2017-08-31 07:54:29 +02:00
translatewiki.net c62f00477e Localisation updates from https://translatewiki.net. 2017-08-21 07:36:39 +02:00