summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-04Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-02Localisation updates from https://translatewiki.net.translatewiki.net
2017-04-27Localisation updates from https://translatewiki.net.translatewiki.net
2017-04-24Localisation updates from https://translatewiki.net.translatewiki.net
2017-04-20Localisation updates from https://translatewiki.net.translatewiki.net
2017-04-19Merge pull request #3173 from therealshredder/use-https-in-readmeLuiza Pagliari
Use HTTPS for images in README.md
2017-04-19Use HTTPS for images in README.mdThomas Wucher
This change prevents mixed-content warnings on pages displaying the readme via HTTPS.
2017-04-18Merge pull request #3161 from ether/feature/automatic_force_reconnectLuiza Pagliari
Feature: automatic force reconnect
2017-04-16Merge pull request #3170 from AdamNiederer/patch-2webzwo0i
Butt On -> button
2017-04-15Butt On -> buttonAdam Niederer
2017-04-06Merge pull request #3162 from ether/fix_connection_to_sauce_labsLuiza Pagliari
Fix connection to sauce labs
2017-04-06[fix] Fix path on test scriptLuiza Pagliari
2017-04-06[fix] Use new SauceConnect provided by Sauce LabsLuiza Pagliari
Could not dowload "Sauce-Connect-latest.zip" anymore, need to change to new version of SauceConnect.
2017-04-06Localisation updates from https://translatewiki.net.translatewiki.net
2017-04-05[feature] Only automatically reconnect if can establish connection to serverLuiza Pagliari
Avoid trying to reload pad when network is not available.
2017-04-04[feature] i18n for automatic reconnection messages/buttonsLuiza Pagliari
2017-04-04Merge pull request #3160 from pageye123/developLuiza Pagliari
wrong path of generate.js
2017-04-04[test] Create tests for automatic reconnection on errorLuiza Pagliari
2017-04-04[feature] Create option to automatically reconnect after a few secondsLuiza Pagliari
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-04wrong path of generate.jsjeffreyye
2017-04-03Localisation updates from https://translatewiki.net.translatewiki.net
2017-03-30Localisation updates from https://translatewiki.net.translatewiki.net
2017-03-20Localisation updates from https://translatewiki.net.translatewiki.net
2017-03-13Merge pull request #3149 from AdamNiederer/patch-1Luiza Pagliari
Remove an extra space
2017-03-13Merge pull request #3150 from AdamNiederer/developLuiza Pagliari
Docs: Lots of spelling fixes
2017-03-13Localisation updates from https://translatewiki.net.translatewiki.net
2017-03-11Fix typoAdam Niederer
2017-03-11Spelling fixesAdam Niederer
2017-03-11Spelling fixesAdam Niederer
2017-03-11Spelling, grammar, and style improvementsAdam Niederer
2017-03-11Spelling fixAdam Niederer
Also removes an extra space
2017-03-11Grammar fixAdam Niederer
2017-03-11Remove an extra spaceAdam Niederer
2017-03-06Localisation updates from https://translatewiki.net.translatewiki.net
2017-02-27Localisation updates from https://translatewiki.net.translatewiki.net
2017-02-23Localisation updates from https://translatewiki.net.translatewiki.net
2017-02-20Merge pull request #3141 from ether/fix_ie10_testLuiza Pagliari
Fix IE10 test
2017-02-20[fix] Remove extra whitespace on helper tests for IELuiza Pagliari
2017-02-20[refactor] Use better way to select a single lineLuiza Pagliari
2017-02-20[test] Fix helper tests for IELuiza Pagliari
2017-02-08Merge pull request #3136 from joassouza/fix_minifyLuiza Pagliari
Fix minification of JS files
2017-02-07Refactor codejoassouza
2017-02-07Fix minification of codejoassouza
2017-02-06Localisation updates from https://translatewiki.net.translatewiki.net
2017-02-03Merge pull request #3135 from storytouch/developLuiza Pagliari
[fix] Fix drag and drop tests for IE
2017-02-03[fix] Fix drag and drop tests for IELuiza Pagliari
2017-02-02Merge pull request #3119 from storytouch/fix_3118Luiza Pagliari
Create plugin to run tests for line attribs + fix #3118
2017-01-29Merge pull request #3131 from Sjord/remove-outdated-commentStefan
Remove deprecated comment
2017-01-26Remove deprecated commentSjoerd Langkemper
The session key is currently stored in SESSIONKEY.txt, so it is no longer reset every time the server starts.
2017-01-17Merge pull request #3123 from Sjord/fix-hook-called-fromLuiza Pagliari
Update called from for two hooks