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
52d5fc713e
Spelling fixes
2017-03-11 21:36:37 -05:00
867e2d69d4
Spelling, grammar, and style improvements
2017-03-11 21:35:00 -05:00
6d279f0ee1
Spelling fix
...
Also removes an extra space
2017-03-11 21:34:34 -05:00
a5e576c564
Grammar fix
2017-03-11 21:30:32 -05:00
eeb8e82771
Remove an extra space
2017-03-11 21:27:34 -05:00
bc0eff6dd0
Localisation updates from https://translatewiki.net .
2017-03-06 08:49:04 +01:00
9515109308
Localisation updates from https://translatewiki.net .
2017-02-27 07:48:12 +01:00
393f651770
Localisation updates from https://translatewiki.net .
2017-02-23 09:00:01 +01:00
e95395a88f
Merge pull request #3141 from ether/fix_ie10_test
...
Fix IE10 test
2017-02-20 07:50:38 -03:00
2b96a961e3
[fix] Remove extra whitespace on helper tests for IE
2017-02-20 06:14:27 -03:00
15cda0fde6
[refactor] Use better way to select a single line
2017-02-20 06:03:56 -03:00
92be656113
[test] Fix helper tests for IE
2017-02-20 06:02:31 -03:00
203a48b42d
Merge pull request #3136 from joassouza/fix_minify
...
Fix minification of JS files
2017-02-08 04:14:44 -02:00
0025613ba6
Refactor code
2017-02-07 15:06:49 -02:00
d1e6c8492d
Fix minification of code
2017-02-07 13:04:22 -02:00
306e63c3f5
Localisation updates from https://translatewiki.net .
2017-02-06 07:52:00 +01:00
1500ed63f0
Merge pull request #3135 from storytouch/develop
...
[fix] Fix drag and drop tests for IE
2017-02-03 06:48:26 -02:00
02bd4a31af
[fix] Fix drag and drop tests for IE
2017-02-03 06:47:33 -02:00
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
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
40f54fed38
Merge pull request #3131 from Sjord/remove-outdated-comment
...
Remove deprecated comment
2017-01-29 12:54:17 +01:00
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
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
d48395089c
Update called from for two hooks
...
`expressCreateServer` and `expressConfigure` are called from `express.js`, not
from `server.js`.
2017-01-17 14:59:24 +01:00
d65ab4d80b
Merge pull request #3122 from tpltnt/freebsd-pkg-fix
...
readme: added curl as dependency
2017-01-12 18:21:33 -02:00
6e1bf9dc90
added curl as dependency
2017-01-12 20:50:31 +01:00
520f257ed1
[chore] Use helper plugin when running tests on Travis
...
This plugin allows us to test code related to plugins, like testing
issues that only happen when we have plugins using line attribs, for
example (see #3118 ).
2017-01-12 13:04:32 -02:00
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
cc69e76200
redirect /admin properly ( fix #3114 )
2017-01-06 18:19:38 +01:00
deed74c8c8
Localisation updates from https://translatewiki.net .
2017-01-02 09:00:13 +01:00
webzwo0i