libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5119 commits 2 branches 0 tags 24 MiB
Commit graph

5119 commits

This branch
This branch
All branches
Author SHA1 Message Date
translatewiki.net
7b4f672b79 Localisation updates from https://translatewiki.net. 2017-06-26 09:07:27 +02:00
Jan Holub
7029248a76 Added RobotoMono as a more modern and pretty monospaced font, addressing #3201 
I added RobotoMono-Regular and RobotoMono-Bold as TrueTypeFont files and included them into the list. I tred to stay in alphabetical order where possible.

The author of #3201 was asking for a more modern monospaced font.
 2017-06-21 23:44:23 +02:00
translatewiki.net
2e77a28695 Localisation updates from https://translatewiki.net. 2017-06-19 14:10:49 +02:00
translatewiki.net
0fdb031839 Localisation updates from https://translatewiki.net. 2017-06-15 07:47:04 +02:00
translatewiki.net
1db87e1133 Localisation updates from https://translatewiki.net. 2017-06-05 07:34:21 +02:00
translatewiki.net
1c26ac5c6f Localisation updates from https://translatewiki.net. 2017-06-01 07:15:35 +02:00
Luiza Pagliari
21f3c56c0e Merge pull request #3196 from jduckles/patch-1 
Fix markdown H1
 2017-05-30 05:39:45 -03:00
Claudius Mbemba
8d60bd5234 fixed plugin dependency issue 
running ./bin/run.sh after the 1st time caused the following error "TypeError: Cannot read property 'dependencies' of undefined".
fixed it.
 2017-05-30 05:36:29 +02:00
Jonah Duckles
fcde66050e Fix markdown H1 2017-05-30 13:34:07 +12:00
Luiza Pagliari
b6cb46271b Merge pull request #3182 from storytouch/fix/do_not_hide_force_reconnect_modal 
Improvements on modals and "force reconnect" messages
 2017-05-29 11:05:37 -03:00
translatewiki.net
faefa8a9ef Localisation updates from https://translatewiki.net. 2017-05-29 07:50:59 +02:00
translatewiki.net
c7dac38af5 Localisation updates from https://translatewiki.net. 2017-05-21 09:52:24 +02:00
translatewiki.net
66df56559c Localisation updates from https://translatewiki.net. 2017-05-20 10:53:31 +02:00
Luiza Pagliari
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
Luiza Pagliari
fc89034a55 [feat] New server-side hook: padCopy 
Let plugins know when a pad is copied.
 2017-05-18 18:52:14 -03:00
Luiza Pagliari
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
Luiza Pagliari
8345fd1539 Merge pull request #3191 from ether/fix/adjustments_of_2891 
Adjustments of #2891
 2017-05-11 15:19:52 -03:00
Luiza Pagliari
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
Luiza Pagliari
97038c2183 [fix] Fix shortcut enabling flag for 'ESC' 
This is an adjustment to #2891.
 2017-05-11 12:36:20 -03:00
Luiza Pagliari
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
Luiza Pagliari
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
Luiza Pagliari
1ebcf0dc47 Merge pull request #2891 from bhldev/padShortcutDisable 
Added pad shortcut disabling feature to settings.json
 2017-05-11 11:29:25 -03:00
translatewiki.net
ef415880f0 Localisation updates from https://translatewiki.net. 2017-05-11 08:32:44 +02:00
Luiza Pagliari
983946e664 Merge pull request #3188 from lex111/patch-1 
Fix links to README.md
 2017-05-10 09:57:32 -03:00
Alexey Pyltsyn
2dc3eb79d2 Fix links to README.md 2017-05-09 08:28:29 +03:00
Mikk Andresen
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
Mikk Andresen
582e2c3819 Use padcookie instead of raw prefs cookie reading 2017-05-05 11:07:54 +03:00
Mikk Andresen
7790c5606b Fix regexp 2017-05-05 10:54:26 +03:00
Mikk Andresen
96cc1ad55a Use different cookie name for different protocols - https://github.com/ether/etherpad-lite/issues/3179 2017-05-05 10:28:44 +03:00
Luiza Pagliari
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
Luiza Pagliari
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
translatewiki.net
b43137ad2c Localisation updates from https://translatewiki.net. 2017-05-04 07:42:20 +02:00
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