Commit Graph

5044 Commits

Author SHA1 Message Date
bm jade 64aee56940 FIX
missing backslashes
2017-08-07 17:15:02 +02:00
bm jade 193afacb6f FIX
fix provide by skupfer from github, It fix the installOnWindows problem
2017-08-07 16:36:44 +02:00
translatewiki.net e93d607165 Localisation updates from https://translatewiki.net. 2017-08-07 07:22:05 +02:00
Martin Honermeyer f10e60713b Update socket.io to 1.7.3
That in turn upgrades engine.io to 1.8.2. This fixes a crash for me when
running behind a traefik reverse proxy.
https://github.com/socketio/engine.io/issues/465
2017-08-04 15:42:25 +02:00
Jainendra Mandavi b4ddd0276d Use abiword to process .rft files 2017-08-04 03:23:12 +05:30
translatewiki.net 8abba28756 Localisation updates from https://translatewiki.net. 2017-08-03 10:39:40 +02:00
Michael Braun 4cce3bcbed Make APIKEY und SESSIONKEY file customizable
Running multiple instances sometimes requires different api- and session-keys for security reasons.
2017-07-31 15:31:45 +02:00
translatewiki.net 67c4e336e0 Localisation updates from https://translatewiki.net. 2017-07-31 14:58:13 +02:00
Stefan f6456c0aa7 Merge pull request #3187 from tiblu/ep_prefs_different_cookie_for_different_protocol
#3179 - Using EP on same domain, but over different protocols causes "Warning: it appears that your browser does not have cookies enabled.
2017-07-30 11:49:29 +02:00
Stefan 5382b06ede Merge pull request #3231 from jainendra/fix-2864-import-pdf
FIX-2864: Add useAbiword flag
2017-07-30 11:42:39 +02:00
Jainendra Mandavi e4ddb42e11 FIX-2864: Add useAbiword flag
This is a fix for the issue - 2864
Which is import failure of PDF after importing a text file
2017-07-28 23:13:07 +05:30
Robert Helmer 59ba183c82 Issue #2948 - disable sauce labs frontend tests until they are working. (#3230) 2017-07-27 17:41:18 -03:00
translatewiki.net 65fc8d830b Localisation updates from https://translatewiki.net. 2017-07-27 10:10:28 +02:00
Matic Potočnik cdaee77a76 Fix AbiWord wikilink and capitalization (#3227) 2017-07-26 21:42:42 -03:00
Jan Holub 8bd8be97b9 Added support for the Montserrat Font as discussed in #3201 (#3205)
* Added support for the Montserrat Font as discussed in #3201

I chose a thin version of the Font (namely Montserrat Light) as the regular font and Montserrat Regular as the bold version. The thin fonts just look better in my opinion.
2017-07-12 12:21:48 -03:00
Luiza Pagliari 8c57c8d0d6 Merge pull request #3206 from 00SteinsGate00/RobotoMono
Added RobotoMono as a more modern and pretty monospaced font
2017-07-12 08:02:08 -03:00
Luiza Pagliari 3e5d71ad5a Merge pull request #3214 from patrickeasters/add_credentials_arg
Add credentials arg to CLI module
2017-07-12 07:22:17 -03:00
Mikołaj Biel 5c8a15c3d7 fix `sessionCookie` number in onAccessCheck 2017-07-12 00:28:51 +02:00
Luiza Pagliari 2b827b843d Merge pull request #3215 from klausweiss/fixtypo_secman_doc
Fix a typo in SessionManager
2017-07-10 20:02:47 -03:00
Mikołaj Biel 2508b9749c fix typo 2017-07-10 20:59:08 +02:00
Mikołaj Biel 35702a0589 [feat] New server-side hook: onAccessCheck 2017-07-10 20:54:32 +02:00
translatewiki.net f9203524a4 Localisation updates from https://translatewiki.net. 2017-07-06 11:10:08 +02:00
Patrick Easters d72d79ea82 Fetch credentials arg from CLI 2017-07-05 15:20:02 -04:00
translatewiki.net 12cb8e0dc1 Localisation updates from https://translatewiki.net. 2017-07-04 10:04:28 +02:00
translatewiki.net b2ba0625f7 Localisation updates from https://translatewiki.net. 2017-07-03 07:35:44 +02:00
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