mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 08:56:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
8077 commits 213 branches 107 tags 72 MiB
Commit graph

4977 commits

Author SHA1 Message Date
John McLear
83ce73b77b
Merge pull request #3134 from psaavedra/develop 
WA added  in #1766 is not longer needed
 2018-04-03 13:10:19 +01:00
John McLear
022783a774
Merge pull request #3239 from jainendra/jainendra-feature-support-for-rtf 
Feature: Support for uploading .rtf files rich text format
 2018-04-03 13:07:00 +01:00
John McLear
bb40aa00be
Update express.js 2018-04-03 10:59:10 +01:00
John McLear
50bbcb87bb
Merge pull request #4 from nashe/jsonp_fix 
Added a jsonp var checker
 2018-04-03 10:29:52 +01:00
Mikk Andresen
6f2466bebc Merge with upstream develop. 2018-04-02 13:47:16 +03:00
ilmar
cf82177b36 ueberDB2 update 2018-03-26 17:57:00 +03:00
Luc Didry
b0da9a579d Fix numbering line when plugin add padding-top (like ep_page_view) 2018-03-25 19:24:52 +02:00
John McLear
6c2135bf9a
Merge pull request #6 from nashe/bumpDeps2 
Update Deps
 2018-03-24 11:08:19 +00:00
John McLear
8767410a36
be more strict on password check 2018-03-23 19:21:52 +00:00
John McLear
e285db9e80
Update Deps 
https://i.imgur.com/cxFXNeY.png
 2018-03-23 13:21:59 +00:00
Peter 'Pita' Martischka
dd7894d3c9 Added a jsonp var checker 2018-03-23 11:17:39 +00:00
translatewiki.net
cb856ea624 Localisation updates from https://translatewiki.net. 2018-03-22 08:09:21 +01:00
translatewiki.net
d80d64a217 Localisation updates from https://translatewiki.net. 2018-03-19 20:58:02 +01:00
translatewiki.net
49bbb0b59f Localisation updates from https://translatewiki.net. 2018-03-12 08:57:37 +01:00
Luc Didry
82816acf4a Fix .doc export with LibreOffice (soffice) (#3338) 
When using LibreOffice to convert pads to doc, we got `Error: no export filter for /tmp/xxxx.doc` (tested with LO 5 and 6). Maybe it's a regression from LO. Anyway, converting HTML to odt, then to doc works.

Thx to lpagliari for her review!
 2018-03-08 10:44:11 -03:00
translatewiki.net
6aa19c56a8 Localisation updates from https://translatewiki.net. 2018-03-08 09:28:32 +01:00
translatewiki.net
6f979ca1ef Localisation updates from https://translatewiki.net. 2018-02-22 12:08:59 +01:00
Luiza Pagliari
187e51948d
[fix] Don't show "pad deleted" message when copying pad (#3320) 
Fix #3183
 2018-02-16 14:18:51 -02:00
translatewiki.net
0c806b7fc0 Localisation updates from https://translatewiki.net. 2018-02-15 09:49:08 +01:00
Luc Didry
0495dbdb16 Update ueberdb dep to 0.3.6 (#3326) 2018-02-14 15:07:50 -02:00
Man Yue Mo
a2992b3624 fix jsonp checking. 2018-02-07 08:43:07 +00: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
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
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 (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
ilmar
30400509ba added tiblus ep_prefs_different_cookie_for_different_protocol 2017-11-03 10:47:54 +02:00
translatewiki.net
097c07adec Localisation updates from https://translatewiki.net. 2017-11-02 08:12:10 +01:00