summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-06-05Localisation updates from https://translatewiki.net.translatewiki.net
2017-06-01Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-29Merge pull request #3182 from storytouch/fix/do_not_hide_force_reconnect_modalLuiza Pagliari
Improvements on modals and "force reconnect" messages
2017-05-29Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-21Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-20Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-18[feat] New server-side hook: padCopyLuiza Pagliari
Let plugins know when a pad is copied.
2017-05-12[fix] Do not close ANY "force reconnect" messageLuiza Pagliari
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-11[fix] Have one setting for each shortcut to create ordered listLuiza Pagliari
This is an adjustment to #2891.
2017-05-11[fix] Fix shortcut enabling flag for 'ESC'Luiza Pagliari
This is an adjustment to #2891.
2017-05-11Do not use cookie for pad shortcutsLuiza Pagliari
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-11Merge pull request #2891 from bhldev/padShortcutDisableLuiza Pagliari
Added pad shortcut disabling feature to settings.json
2017-05-11Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-05Pad_cookie.js to have isCookiesEnabled() cause wasNoCookie() is also true ↵Mikk Andresen
when User visits first time.
2017-05-05Use padcookie instead of raw prefs cookie readingMikk Andresen
2017-05-05Fix regexpMikk Andresen
2017-05-05Use different cookie name for different protocols - ↵Mikk Andresen
https://github.com/ether/etherpad-lite/issues/3179
2017-05-04[fix] Do not close "force reconnect" messagesLuiza Pagliari
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[fix] Close modals when user clicks both on pad inner and outerLuiza Pagliari
Also: split tests for automatic reconnection and regular modal tests.
2017-05-04Localisation updates from https://translatewiki.net.translatewiki.net
2017-05-03[fix] Block user from changing pad after he/she is disconnectedLuiza Pagliari
Use same approach of when channel state is chaged to "DISCONNECTED".
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-18Merge pull request #3161 from ether/feature/automatic_force_reconnectLuiza Pagliari
Feature: automatic force reconnect
2017-04-15Butt On -> buttonAdam Niederer
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-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-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-13Localisation updates from https://translatewiki.net.translatewiki.net
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-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-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-12[fix] Consider line attribs of plugins when building changesetsLuiza Pagliari
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-02Localisation updates from https://translatewiki.net.Niklas Laxström
2016-12-29Localisation updates from https://translatewiki.net.Niklas Laxström
2016-12-23Release version 1.6.1Stefan
2016-12-22Fixed crash on invalid export urlStefan