libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 14:39:53 +01:00
Code Issues Projects Releases Wiki Activity
5033 commits 206 branches 105 tags 123 MiB
Commit graph

2598 commits

Author SHA1 Message Date
Peter 'Pita' Martischka
6d5dc93dbf merged 2018-04-07 10:23:49 +01:00
John McLear
c34350f307 Beginning to make release 2018-04-07 09:22:13 +01:00
thomas
ffe24c3dd9
Update webaccess.js 2018-04-06 22:21:33 +02:00
John McLear
86ec963775 Fixes #3137 
#3137
 2018-04-06 13:52:04 +01:00
ilmar
b4ad7cf452 Export lists fix + code linting and readability update 2018-04-05 23:27:02 +03:00
Peter 'Pita' Martischka
a08c4383b8 check pad exists before importing / exporting 2018-04-04 21:48:32 +01:00
John McLear
735052e1a2
Update package.json 2018-04-04 20:13:28 +01:00
John McLear
6388055f51
Merge pull request #12 from nashe/no_findkeys_export 
No findkeys during export
 2018-04-04 19:36:59 +01:00
Peter 'Pita' Martischka
806c9207e3 remove findkeys from pad export 2018-04-04 18:02:54 +01:00
John McLear
5a0afab02e
remove license thing from exports 2018-04-04 13:33:46 +01:00
Mikk Andresen
64a2e5b7a3 Upgrade Ueberdb2 to 0.3.7 to fix https://github.com/ether/etherpad-lite/issues/3348 2018-04-04 13:52:59 +03:00
Mikk Andresen
20428bb427 Merge remote-tracking branch 'upstream/develop' into develop 2018-04-04 13:52:27 +03:00
Mikk Andresen
a67aaa8f49 Merge remote-tracking branch 'upstream/master' into develop 2018-04-04 13:52:08 +03:00
Mikk Andresen
a4819b21f2 Upgrade Ueberdb2 to 0.3.7 to fix https://github.com/ether/etherpad-lite/issues/3348 2018-04-04 13:40:02 +03:00
John McLear
f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility 
Improved readibility
 2018-04-03 17:22:08 +01:00
John McLear
8edd8e1291
Update package.json 2018-04-03 15:47:02 +01:00
John McLear
f4f032afc0
Merge pull request #3297 from apenwarr/auth-sequence 
Call authentication hooks before default basic authentication.
 2018-04-03 13:41:51 +01:00
John McLear
2765a95774
Merge pull request #3218 from klausweiss/develop 
Feature: New server-side hook: onAccessCheck
 2018-04-03 13:38:47 +01:00
John McLear
d393bf4dd8
Merge pull request #3232 from michael-dev/develop 
Make APIKEY and SESSIONKEY file customizable
 2018-04-03 13:34:49 +01:00
John McLear
bb83d39ff0
Merge pull request #3197 from User1m/patch-1 
fixed plugin dependency issue
 2018-04-03 13:13:11 +01:00
John McLear
18dd90139a
Merge pull request #3115 from noerw/redirect_fix 
redirect /admin properly (fix #3114)
 2018-04-03 13:10:36 +01:00
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
ilmar
76f211b0bf ExportHtml.js update 2017-11-01 09:48:23 +02:00
ilmar
5469ce85cd exportHTML update 2017-10-31 22:46:24 +02:00
ilmar
724b1d734b updated html export, run hooks also with lists 2017-10-31 16:23:41 +02:00
translatewiki.net
266b4a6a51 Localisation updates from https://translatewiki.net. 2017-10-23 04:59:18 +02:00
ilmar
c36a3264fe fix to ether/etherpad-lite#2486 2017-10-21 01:04:53 +03:00
ilmar
69bf32cd46 fix to https://github.com/ether/etherpad-lite/issues/2486 2017-10-19 16:11:40 +03:00
translatewiki.net
8c85205a80 Localisation updates from https://translatewiki.net. 2017-10-19 09:01:31 +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
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
translatewiki.net
392d649f4d Localisation updates from https://translatewiki.net. 2017-08-17 15:31:28 +02:00
Luiza Pagliari
ed5213c9a2 Revert "[feat] Update l10n lib (#3248)" (#3249) 
This reverts commit 6bcaa00a4b.
 2017-08-15 11:09:56 -03:00
Luiza Pagliari
6bcaa00a4b [feat] Update l10n lib (#3248) 
Last update was from 2014.

Fix #3244.
 2017-08-15 10:22:59 -03:00
translatewiki.net
9b9d604c09 Localisation updates from https://translatewiki.net. 2017-08-14 08:14:37 +02:00
translatewiki.net
e93d607165 Localisation updates from https://translatewiki.net. 2017-08-07 07:22:05 +02:00
Martin Honermeyer
f10e60713b Update socket.io to 1.7.3 
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
 2017-08-04 15:42:25 +02:00
Jainendra Mandavi
b4ddd0276d Use abiword to process .rft files 2017-08-04 03:23:12 +05:30
translatewiki.net
8abba28756 Localisation updates from https://translatewiki.net. 2017-08-03 10:39:40 +02:00
Michael Braun
4cce3bcbed Make APIKEY und SESSIONKEY file customizable 
Running multiple instances sometimes requires different api- and session-keys for security reasons.
 2017-07-31 15:31:45 +02:00
translatewiki.net
67c4e336e0 Localisation updates from https://translatewiki.net. 2017-07-31 14:58:13 +02:00
Stefan
f6456c0aa7 Merge pull request #3187 from tiblu/ep_prefs_different_cookie_for_different_protocol 
#3179 - Using EP on same domain, but over different protocols causes "Warning: it appears that your browser does not have cookies enabled.
 2017-07-30 11:49:29 +02:00
Stefan
5382b06ede Merge pull request #3231 from jainendra/fix-2864-import-pdf 
FIX-2864: Add useAbiword flag
 2017-07-30 11:42:39 +02:00
Jainendra Mandavi
e4ddb42e11 FIX-2864: Add useAbiword flag 
This is a fix for the issue - 2864
Which is import failure of PDF after importing a text file
 2017-07-28 23:13:07 +05:30
translatewiki.net
65fc8d830b Localisation updates from https://translatewiki.net. 2017-07-27 10:10:28 +02:00