faefa8a9ef
Localisation updates from https://translatewiki.net .
2017-05-29 07:50:59 +02:00
c7dac38af5
Localisation updates from https://translatewiki.net .
2017-05-21 09:52:24 +02:00
66df56559c
Localisation updates from https://translatewiki.net .
2017-05-20 10:53:31 +02:00
48ead83d62
Merge pull request #3195 from ether/feature/new_hook_when_pad_is_copied
...
[feat] New server-side hook: padCopy
2017-05-18 19:21:18 -03:00
fc89034a55
[feat] New server-side hook: padCopy
...
Let plugins know when a pad is copied.
2017-05-18 18:52:14 -03:00
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
8345fd1539
Merge pull request #3191 from ether/fix/adjustments_of_2891
...
Adjustments of #2891
2017-05-11 15:19:52 -03:00
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
97038c2183
[fix] Fix shortcut enabling flag for 'ESC'
...
This is an adjustment to #2891 .
2017-05-11 12:36:20 -03:00
688e8f37a3
[fix] Fix format of settings template + add information about shortcuts
...
There was an extra comma at the end of shortcut list, this was breaking
Etherpad startup.
This is an adjustment to #2891 .
2017-05-11 12:32:12 -03:00
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
1ebcf0dc47
Merge pull request #2891 from bhldev/padShortcutDisable
...
Added pad shortcut disabling feature to settings.json
2017-05-11 11:29:25 -03:00
ef415880f0
Localisation updates from https://translatewiki.net .
2017-05-11 08:32:44 +02:00
983946e664
Merge pull request #3188 from lex111/patch-1
...
Fix links to README.md
2017-05-10 09:57:32 -03:00
2dc3eb79d2
Fix links to README.md
2017-05-09 08:28:29 +03:00
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
582e2c3819
Use padcookie instead of raw prefs cookie reading
2017-05-05 11:07:54 +03:00
7790c5606b
Fix regexp
2017-05-05 10:54:26 +03:00
96cc1ad55a
Use different cookie name for different protocols - https://github.com/ether/etherpad-lite/issues/3179
2017-05-05 10:28:44 +03:00
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
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
b43137ad2c
Localisation updates from https://translatewiki.net .
2017-05-04 07:42:20 +02:00
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
32ed4315e2
Localisation updates from https://translatewiki.net .
2017-05-02 07:52:46 +02:00
51910e9187
Localisation updates from https://translatewiki.net .
2017-04-27 08:11:23 +02:00
5f0e7e01d7
Localisation updates from https://translatewiki.net .
2017-04-24 19:46:41 +02:00
bc5c8ec0cf
Localisation updates from https://translatewiki.net .
2017-04-20 07:28:20 +02:00
9a3b021c23
Merge pull request #3173 from therealshredder/use-https-in-readme
...
Use HTTPS for images in README.md
2017-04-19 10:04:50 -03:00
127009f719
Use HTTPS for images in README.md
...
This change prevents mixed-content warnings on pages displaying the readme via HTTPS.
2017-04-19 14:36:48 +02:00
8081164a72
Merge pull request #3161 from ether/feature/automatic_force_reconnect
...
Feature: automatic force reconnect
2017-04-18 10:21:19 -03:00
991155c8d4
Merge pull request #3170 from AdamNiederer/patch-2
...
Butt On -> button
2017-04-16 02:34:27 +02:00
11813f33a5
Butt On -> button
2017-04-15 20:12:44 -04:00
9bea5a64b8
Merge pull request #3162 from ether/fix_connection_to_sauce_labs
...
Fix connection to sauce labs
2017-04-06 03:20:15 -03:00
a85eb395b4
[fix] Fix path on test script
2017-04-06 03:12:45 -03:00
db003a1460
[fix] Use new SauceConnect provided by Sauce Labs
...
Could not dowload "Sauce-Connect-latest.zip" anymore, need to change to
new version of SauceConnect.
2017-04-06 03:05:38 -03:00
eea9304b4d
Localisation updates from https://translatewiki.net .
2017-04-06 07:14:59 +02:00
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
0eae83f252
[feature] i18n for automatic reconnection messages/buttons
2017-04-04 18:09:33 -03:00
23969c33b9
Merge pull request #3160 from pageye123/develop
...
wrong path of generate.js
2017-04-04 13:10:02 -03:00
5e90700561
[test] Create tests for automatic reconnection on error
2017-04-04 13:07:40 -03:00
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
9ca56a4c7e
wrong path of generate.js
2017-04-04 15:13:07 +08:00
cf6b246688
Localisation updates from https://translatewiki.net .
2017-04-03 07:25:13 +02:00
ed029b599e
Localisation updates from https://translatewiki.net .
2017-03-30 07:40:12 +02:00
ce2c74d120
Localisation updates from https://translatewiki.net .
2017-03-20 07:24:19 +01:00
d78681350b
Merge pull request #3149 from AdamNiederer/patch-1
...
Remove an extra space
2017-03-13 06:55:07 -03:00
f91534d57a
Merge pull request #3150 from AdamNiederer/develop
...
Docs: Lots of spelling fixes
2017-03-13 06:54:33 -03:00
5eadc715a6
Localisation updates from https://translatewiki.net .
2017-03-13 08:08:38 +01:00
cb8fe92df7
Fix typo
2017-03-11 22:09:49 -05:00
7520377026
Spelling fixes
2017-03-11 21:38:50 -05:00
translatewiki.net