Commit Graph

4839 Commits

Author SHA1 Message Date
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 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
Thomas Wucher 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
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
webzwo0i 991155c8d4 Merge pull request #3170 from AdamNiederer/patch-2
Butt On -> button
2017-04-16 02:34:27 +02:00
Adam Niederer 11813f33a5 Butt On -> button 2017-04-15 20:12:44 -04:00
Luiza Pagliari 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
Luiza Pagliari a85eb395b4 [fix] Fix path on test script 2017-04-06 03:12:45 -03:00
Luiza Pagliari 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
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 23969c33b9 Merge pull request #3160 from pageye123/develop
wrong path of generate.js
2017-04-04 13:10:02 -03:00
Luiza Pagliari 5e90700561 [test] Create tests for automatic reconnection on error 2017-04-04 13:07:40 -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
jeffreyye 9ca56a4c7e wrong path of generate.js 2017-04-04 15:13:07 +08: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
Luiza Pagliari d78681350b Merge pull request #3149 from AdamNiederer/patch-1
Remove an extra space
2017-03-13 06:55:07 -03:00
Luiza Pagliari f91534d57a Merge pull request #3150 from AdamNiederer/develop
Docs: Lots of spelling fixes
2017-03-13 06:54:33 -03:00
translatewiki.net 5eadc715a6 Localisation updates from https://translatewiki.net. 2017-03-13 08:08:38 +01:00
Adam Niederer cb8fe92df7 Fix typo 2017-03-11 22:09:49 -05:00
Adam Niederer 7520377026 Spelling fixes 2017-03-11 21:38:50 -05:00
Adam Niederer 52d5fc713e Spelling fixes 2017-03-11 21:36:37 -05:00
Adam Niederer 867e2d69d4 Spelling, grammar, and style improvements 2017-03-11 21:35:00 -05:00
Adam Niederer 6d279f0ee1 Spelling fix
Also removes an extra space
2017-03-11 21:34:34 -05:00
Adam Niederer a5e576c564 Grammar fix 2017-03-11 21:30:32 -05:00
Adam Niederer eeb8e82771 Remove an extra space 2017-03-11 21:27:34 -05: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 e95395a88f Merge pull request #3141 from ether/fix_ie10_test
Fix IE10 test
2017-02-20 07:50:38 -03:00
Luiza Pagliari 2b96a961e3 [fix] Remove extra whitespace on helper tests for IE 2017-02-20 06:14:27 -03:00
Luiza Pagliari 15cda0fde6 [refactor] Use better way to select a single line 2017-02-20 06:03:56 -03:00
Luiza Pagliari 92be656113 [test] Fix helper tests for IE 2017-02-20 06:02:31 -03: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 1500ed63f0 Merge pull request #3135 from storytouch/develop
[fix] Fix drag and drop tests for IE
2017-02-03 06:48:26 -02:00
Luiza Pagliari 02bd4a31af [fix] Fix drag and drop tests for IE 2017-02-03 06:47:33 -02: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
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 f2a22f197d Merge pull request #3123 from Sjord/fix-hook-called-from
Update called from for two hooks
2017-01-17 12:19:29 -02:00