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 06:29:53 +01:00
Code Issues Projects Releases Wiki Activity
5045 commits 206 branches 105 tags 123 MiB
Commit graph

2604 commits

Author SHA1 Message Date
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
Matic Potočnik
cdaee77a76 Fix AbiWord wikilink and capitalization (#3227) 2017-07-26 21:42:42 -03:00
Jan Holub
8bd8be97b9 Added support for the Montserrat Font as discussed in #3201 (#3205) 
* Added support for the Montserrat Font as discussed in #3201

I chose a thin version of the Font (namely Montserrat Light) as the regular font and Montserrat Regular as the bold version. The thin fonts just look better in my opinion.
 2017-07-12 12:21:48 -03:00
Luiza Pagliari
8c57c8d0d6 Merge pull request #3206 from 00SteinsGate00/RobotoMono 
Added RobotoMono as a more modern and pretty monospaced font
 2017-07-12 08:02:08 -03:00
Luiza Pagliari
3e5d71ad5a Merge pull request #3214 from patrickeasters/add_credentials_arg 
Add credentials arg to CLI module
 2017-07-12 07:22:17 -03:00
Mikołaj Biel
2508b9749c fix typo 2017-07-10 20:59:08 +02:00
Mikołaj Biel
35702a0589 [feat] New server-side hook: onAccessCheck 2017-07-10 20:54:32 +02:00
translatewiki.net
f9203524a4 Localisation updates from https://translatewiki.net. 2017-07-06 11:10:08 +02:00
Patrick Easters
d72d79ea82 Fetch credentials arg from CLI 2017-07-05 15:20:02 -04:00
translatewiki.net
12cb8e0dc1 Localisation updates from https://translatewiki.net. 2017-07-04 10:04:28 +02:00
translatewiki.net
b2ba0625f7 Localisation updates from https://translatewiki.net. 2017-07-03 07:35:44 +02:00
translatewiki.net
7b4f672b79 Localisation updates from https://translatewiki.net. 2017-06-26 09:07:27 +02:00
Jan Holub
7029248a76 Added RobotoMono as a more modern and pretty monospaced font, addressing #3201 
I added RobotoMono-Regular and RobotoMono-Bold as TrueTypeFont files and included them into the list. I tred to stay in alphabetical order where possible.

The author of #3201 was asking for a more modern monospaced font.
 2017-06-21 23:44:23 +02:00
translatewiki.net
2e77a28695 Localisation updates from https://translatewiki.net. 2017-06-19 14:10:49 +02:00
translatewiki.net
0fdb031839 Localisation updates from https://translatewiki.net. 2017-06-15 07:47:04 +02:00
translatewiki.net
1db87e1133 Localisation updates from https://translatewiki.net. 2017-06-05 07:34:21 +02:00
translatewiki.net
1c26ac5c6f Localisation updates from https://translatewiki.net. 2017-06-01 07:15:35 +02:00
Claudius Mbemba
8d60bd5234 fixed plugin dependency issue 
running ./bin/run.sh after the 1st time caused the following error "TypeError: Cannot read property 'dependencies' of undefined".
fixed it.
 2017-05-30 05:36:29 +02:00
Luiza Pagliari
b6cb46271b Merge pull request #3182 from storytouch/fix/do_not_hide_force_reconnect_modal 
Improvements on modals and "force reconnect" messages
 2017-05-29 11:05:37 -03:00
translatewiki.net
faefa8a9ef Localisation updates from https://translatewiki.net. 2017-05-29 07:50:59 +02:00
translatewiki.net
c7dac38af5 Localisation updates from https://translatewiki.net. 2017-05-21 09:52:24 +02:00
translatewiki.net
66df56559c Localisation updates from https://translatewiki.net. 2017-05-20 10:53:31 +02:00
Luiza Pagliari
fc89034a55 [feat] New server-side hook: padCopy 
Let plugins know when a pad is copied.
 2017-05-18 18:52:14 -03:00
Luiza Pagliari
894ebffcaf [fix] Do not close ANY "force reconnect" message 
Fix previous commit. As "force reconnect" buttons have all the same id
on DOM, on the previous commit we were only disallowing the first button
with that id on DOM -- "userdup" -- to be closed by a click on editor.
Casually the tests were using the same error to simulate a "force
reconnect", so even the tests were not getting the issue.
 2017-05-12 07:03:40 -03:00
Luiza Pagliari
0cb8d31e95 [fix] Have one setting for each shortcut to create ordered list 
This is an adjustment to #2891.
 2017-05-11 14:56:09 -03:00
Luiza Pagliari
97038c2183 [fix] Fix shortcut enabling flag for 'ESC' 
This is an adjustment to #2891.
 2017-05-11 12:36:20 -03:00
Luiza Pagliari
cf686282ef Do not use cookie for pad shortcuts 
Users still cannot choose which shortcuts they want to enable/disable,
so it does not make sense (yet) to have a cookie with that preference.

This can be reverted once we create an UI to change shortcuts, but
PLEASE PLEASE PLEASE do not read the cookie every time handleKeyEvent is
called!!!

This is an adjustment to #2891.
 2017-05-11 12:26:14 -03:00
Luiza Pagliari
1ebcf0dc47 Merge pull request #2891 from bhldev/padShortcutDisable 
Added pad shortcut disabling feature to settings.json
 2017-05-11 11:29:25 -03:00
translatewiki.net
ef415880f0 Localisation updates from https://translatewiki.net. 2017-05-11 08:32:44 +02:00
Mikk Andresen
c959cdbaa7 Pad_cookie.js to have isCookiesEnabled() cause wasNoCookie() is also true when User visits first time. 2017-05-05 11:17:07 +03:00
Mikk Andresen
582e2c3819 Use padcookie instead of raw prefs cookie reading 2017-05-05 11:07:54 +03:00
Mikk Andresen
7790c5606b Fix regexp 2017-05-05 10:54:26 +03:00
Mikk Andresen
96cc1ad55a Use different cookie name for different protocols - https://github.com/ether/etherpad-lite/issues/3179 2017-05-05 10:28:44 +03:00
Luiza Pagliari
9176bf9bad [fix] Do not close "force reconnect" messages 
If a "force reconnect" message is displayed to the user, it means the
only way to go back to a healthy state is to reload the pad. So we
cannot hide this kind of message, like what is done with other modals
(eg: "settings").
 2017-05-04 14:34:01 -03:00
Luiza Pagliari
4eec3763b4 [fix] Close modals when user clicks both on pad inner and outer 
Also: split tests for automatic reconnection and regular modal tests.
 2017-05-04 11:22:18 -03:00
translatewiki.net
b43137ad2c Localisation updates from https://translatewiki.net. 2017-05-04 07:42:20 +02:00
Luiza Pagliari
0bd4169663 [fix] Block user from changing pad after he/she is disconnected 
Use same approach of when channel state is chaged to "DISCONNECTED".
 2017-05-03 12:59:57 -03:00
translatewiki.net
32ed4315e2 Localisation updates from https://translatewiki.net. 2017-05-02 07:52:46 +02:00
translatewiki.net
51910e9187 Localisation updates from https://translatewiki.net. 2017-04-27 08:11:23 +02:00
translatewiki.net
5f0e7e01d7 Localisation updates from https://translatewiki.net. 2017-04-24 19:46:41 +02:00
translatewiki.net
bc5c8ec0cf Localisation updates from https://translatewiki.net. 2017-04-20 07:28:20 +02:00
Luiza Pagliari
8081164a72 Merge pull request #3161 from ether/feature/automatic_force_reconnect 
Feature: automatic force reconnect
 2017-04-18 10:21:19 -03:00
Adam Niederer
11813f33a5 Butt On -> button 2017-04-15 20:12:44 -04:00
translatewiki.net
eea9304b4d Localisation updates from https://translatewiki.net. 2017-04-06 07:14:59 +02:00
Luiza Pagliari
384697f653 [feature] Only automatically reconnect if can establish connection to server 
Avoid trying to reload pad when network is not available.
 2017-04-05 15:07:37 -03:00
Luiza Pagliari
0eae83f252 [feature] i18n for automatic reconnection messages/buttons 2017-04-04 18:09:33 -03:00
Luiza Pagliari
009cd31243 [feature] Create option to automatically reconnect after a few seconds 
On some erros that display a modal with "Force reconnect" button, allow
Etherpad to automatically reload pad after a few seconds. Amount of
seconds is defined on settings.json.

Still need to create tests for this feature, and implement i18n.
 2017-04-04 11:09:24 -03:00
translatewiki.net
cf6b246688 Localisation updates from https://translatewiki.net. 2017-04-03 07:25:13 +02:00
translatewiki.net
ed029b599e Localisation updates from https://translatewiki.net. 2017-03-30 07:40:12 +02:00
translatewiki.net
ce2c74d120 Localisation updates from https://translatewiki.net. 2017-03-20 07:24:19 +01:00
translatewiki.net
5eadc715a6 Localisation updates from https://translatewiki.net. 2017-03-13 08:08:38 +01:00
translatewiki.net
bc0eff6dd0 Localisation updates from https://translatewiki.net. 2017-03-06 08:49:04 +01:00
translatewiki.net
9515109308 Localisation updates from https://translatewiki.net. 2017-02-27 07:48:12 +01:00
translatewiki.net
393f651770 Localisation updates from https://translatewiki.net. 2017-02-23 09:00:01 +01:00
Luiza Pagliari
203a48b42d Merge pull request #3136 from joassouza/fix_minify 
Fix minification of JS files
 2017-02-08 04:14:44 -02:00
joassouza
0025613ba6 Refactor code 2017-02-07 15:06:49 -02:00
joassouza
d1e6c8492d Fix minification of code 2017-02-07 13:04:22 -02:00
translatewiki.net
306e63c3f5 Localisation updates from https://translatewiki.net. 2017-02-06 07:52:00 +01:00
Luiza Pagliari
a6436ac8d2 Merge pull request #3119 from storytouch/fix_3118 
Create plugin to run tests for line attribs + fix #3118
 2017-02-02 17:54:20 -02:00
Pablo Saavedra
f5810957b4 This WA is not longer required in the newest Chrome see comments in the issue: ether#2078 
The hack is still necessary in Firefox 51
 2017-02-02 13:53:32 +01:00
Stefan
40f54fed38 Merge pull request #3131 from Sjord/remove-outdated-comment 
Remove deprecated comment
 2017-01-29 12:54:17 +01:00
Sjoerd Langkemper
21a6e66e25 Remove deprecated comment 
The session key is currently stored in SESSIONKEY.txt, so it is no longer reset
every time the server starts.
 2017-01-26 09:59:09 +01:00
Luiza Pagliari
b2d9f57338 [fix] Consider line attribs of plugins when building changesets 
When checking the places on text that are identical between content
before and after a changeset, we were considering only the standard
(Etherpad-core) attributes, and not taking into account attributes
created by the plugins. One consequence was that the '*' marker of lines
with line attribs were being kept, even when the new lines have
different line attribs. See #3118 for more details.

Fix #3118.
 2017-01-12 12:42:56 -02:00
noerw
cc69e76200 redirect /admin properly (fix #3114) 2017-01-06 18:19:38 +01:00
Niklas Laxström
deed74c8c8 Localisation updates from https://translatewiki.net. 2017-01-02 09:00:13 +01:00
Niklas Laxström
f217e29071 Localisation updates from https://translatewiki.net. 2016-12-29 08:24:55 +01:00
Stefan
6dc808ad54 Release version 1.6.1 2016-12-23 21:59:57 +01:00
Stefan
be9ff4a0de Fixed crash on invalid export url 2016-12-22 23:04:06 +01:00
Stefan
efb25f417a Merge pull request #2993 from ether/fixes-2945 
fixes #2945
 2016-12-20 22:08:05 +01:00
Stefan
a1ec061017 Merge pull request #3053 from danfuzz/fix-timeslider-lists 
Fix timeslider lists / indents, but also make CSS `@import` work
 2016-12-20 22:06:31 +01:00
Stefan
8084400e13 Try to init cookies before testing if it exists 2016-12-20 21:57:01 +01:00
Stefan
aefa617797 Merge branch 'develop' into improve_cookies 2016-12-20 21:31:11 +01:00
Stefan
368bbe4836 Merge pull request #3084 from Gared/fix_npm_node7 
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
 2016-12-20 00:07:26 +01:00
Niklas Laxström
db94ce9413 Localisation updates from https://translatewiki.net. 2016-12-19 07:36:35 +01:00
Niklas Laxström
d13a28a1ea Localisation updates from https://translatewiki.net. 2016-12-15 07:31:34 +01:00
Luiza Pagliari
01d23b1f6a Merge pull request #2929 from xavidotron/develop 
Pass through the "item" parameter to registerAceCommand callbacks.
 2016-12-13 06:12:26 -02:00
Stefan
da5ae8b1f7 Merge pull request #3085 from Gared/fix_socketio_options 
Updated option parameters for socket.io to work with latest version
 2016-12-12 23:40:29 +01:00
Niklas Laxström
b41b4726d6 Localisation updates from https://translatewiki.net. 2016-11-24 08:24:37 +01:00
Stefan
352cec1811 Updated socket.io to 1.6.0 2016-11-20 12:44:59 +01:00
Stefan
39a3bedb7b Updated option parameters for socket.io to work with latest version 2016-11-20 12:27:27 +01:00
Stefan
00c9caf7a3 Updated npm to 4.0.2 and removed recursive searching for ep-plugins 2016-11-20 11:28:17 +01:00
Siebrand Mazeland
602fd4629a Localisation updates from https://translatewiki.net. 2016-11-17 09:50:45 +01:00
Paul Carver
573b55af8b Correct the spelling of occured to occurred 
The correct spelling is occurred. See
http://www.gingersoftware.com/english-online/spelling-book/misspelling/occurred-occured-ocurred
or other dictionary search results.
 2016-11-11 12:46:40 -05:00
Niklas Laxström
223127bf39 Localisation updates from https://translatewiki.net. 2016-11-01 07:59:29 +01:00
Niklas Laxström
7dd934f714 Localisation updates from https://translatewiki.net. 2016-10-17 20:19:22 +02:00
Niklas Laxström
2c69511c62 Localisation updates from https://translatewiki.net. 2016-10-13 08:00:32 +02:00
Niklas Laxström
965af5a40b Localisation updates from https://translatewiki.net. 2016-10-06 07:41:01 +02:00
rugk
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3 
Conflicts:
	src/templates/index.html
 2016-09-30 19:20:40 +02:00
John McLear
f289611ba9 Merge pull request #3059 from paper-pauper/librejs 
Added LibreJS support
 2016-09-28 23:02:40 +01:00
Niklas Laxström
93ca44f005 Localisation updates from https://translatewiki.net. 2016-09-27 13:58:36 +02:00
Niklas Laxström
b6e5a2283b Localisation updates from https://translatewiki.net. 2016-09-22 07:27:50 +02:00
Nobody Really
97fd1ab2fe Added LibreJS support 2016-09-20 09:30:35 +02:00
Niklas Laxström
32eb6a2288 Localisation updates from https://translatewiki.net. 2016-09-15 08:18:13 +02:00
Niklas Laxström
7ecf240d9e Localisation updates from https://translatewiki.net. 2016-09-13 07:44:27 +02:00
Dan Bornstein
0a9d02562d Handle relative paths properly, when @importing. 2016-09-09 12:59:02 -07:00