Dan Bornstein
b98ee116b9
Fix typos in ordinal names
...
* `eigth` -> `eighth`
* `twelth` -> `twelfth`
* `sixthteenth` -> `sixteenth`
* `fixteenth` -> `sixteenth`
2016-09-09 00:52:04 +02:00
nashe
937ca09d74
Correctly display plugin list in troubleshooting tab
...
Fixes #3402 .
2018-07-15 23:47:44 +02:00
muxator
24b5817beb
package.json: last reformatting
...
These are the remaining non-whitespace changes needed to normalize package.json
formatting, bringing it in line with the npm 6.1.0 default format.
Future edits to this file should follow this default format, in order to
minimize churn.
2018-07-14 14:58:38 +02:00
muxator
896230ad7c
package.json: whitespace changes
...
Only cosmetic changes to make it easier to understand what changes in the other
commits.
This command:
git diff this-commit-hash^! --ignore-all-space
should give an empty output on this commit.
2018-07-14 14:44:48 +02:00
muxator
7992316c23
package.json: sorted dependencies alphabetically
...
When npm saves packages.json, it sorts the dependencies alphabetically. This
change reorders them.
Its aim, togheter with the next ones, is to have a diff that is inspectable.
Moreover, the mutation of package.json by installDeps.sh will be disabled with
a future change.
2018-07-14 14:19:50 +02:00
Luiza Pagliari
58c3154769
[fix] Ignore default line attribs when detecting edges of changeset ( #3420 )
...
When comparing original content with the changes made by the user, we
need to ignore some line attribs that are added by content collector,
otherwise we would consider the change started on the first char of the
line -- the '*' that is added when line has line attribs.
In order to be able to handle both #3354 and #3118 , we need to take into
account both the styles attribs (to fix #3354 ) and the line attribs
defined by any of the plugins (to fix #3118 ), but we can ignore those
extra line attribs that are added by Etherpad and do not add any
functionality (`'lmkr', 'insertorder', 'start'`).
2018-07-09 17:44:38 -03:00
translatewiki.net
380889b218
Localisation updates from https://translatewiki.net .
2018-07-02 07:56:19 +02:00
Mantary
2be873e3c7
Use keydown instead of keypress on Firefox.
2018-07-01 12:05:46 +02:00
Luc Didry
f35d3456cf
Fix FR dateformat
...
FYI, the dateformat in translatewiki is correct.
2018-06-29 01:23:17 +02:00
translatewiki.net
599b1f4568
Localisation updates from https://translatewiki.net .
2018-06-28 07:21:00 +02:00
translatewiki.net
dfd45f0f57
Localisation updates from https://translatewiki.net .
2018-06-21 08:17:13 +02:00
translatewiki.net
3362c683bc
Localisation updates from https://translatewiki.net .
2018-06-14 12:22:22 +02:00
translatewiki.net
d42393dc93
Localisation updates from https://translatewiki.net .
2018-05-31 08:22:54 +02:00
John McLear
fe08d2a1db
Merge pull request #3268 from citizenos/develop
...
getLineHTMLForExport - Fixes #2486 but breaks plugins
2018-05-21 15:56:58 +01:00
translatewiki.net
bacc37cf9b
Localisation updates from https://translatewiki.net .
2018-05-21 16:02:15 +02:00
ilmar
a96aa88dad
merge with ether/etherpad-lite develop branch
2018-05-21 16:18:40 +03:00
ilmar
4feccff530
merge with develop branch
2018-05-21 15:41:49 +03:00
ilmar
3c66425b60
List indent fix
2018-05-21 13:07:08 +03:00
ilmar
016497dbb4
prevLine/nextLine check fix
2018-05-14 22:57:15 +03:00
muxator
bfec44e346
Release version 1.6.6
2018-05-05 00:53:59 +02:00
ilmar
47e20a2f49
line parsing fix
2018-05-03 00:07:07 +03:00
ilmar
6684f9bfe8
hook callAll to aCallAll
2018-05-02 11:45:48 +03:00
ilmar
55ecf31786
html export fix
2018-05-02 11:12:58 +03:00
ilmar
c9863f81ad
sync with ether/etherpad-lite
2018-05-02 11:08:57 +03:00
ilmar
8d27f3cf03
upgrade to 1.6.5
2018-04-24 13:31:40 +03:00
ilmar
7cc7bb1abc
upgrade to 1.6.5
2018-04-24 12:25:56 +03:00
ilmar
d6fa065ef2
export html to original structure
2018-04-24 12:13:31 +03:00
translatewiki.net
ba322012d7
Localisation updates from https://translatewiki.net .
2018-04-23 08:52:57 +02:00
anugu-chegg
7b6a4aba30
Remove leftover code from earlier commits
2018-04-19 23:23:16 +02:00
anugu-chegg
b4068144c3
Refactor code
2018-04-19 23:23:16 +02:00
anugu-chegg
461ed413b7
Fix few mistakes
2018-04-19 23:23:16 +02:00
anugu-chegg
d41e184a3c
Send commits missed during the reconnect
2018-04-19 23:23:16 +02:00
anugu-chegg
bf05e9ae89
Handle client reconnect properly
2018-04-19 23:23:16 +02:00
anugu-chegg
4265f4175e
Handle socketio errors properly
2018-04-19 23:23:16 +02:00
anugu-chegg
fb20c26c5f
Don't send COMMIT-MESSAGE when socketio connection is not active
2018-04-19 23:23:16 +02:00
Benjamin Schweizer
d26df86490
made url relative
2018-04-19 22:55:40 +02:00
translatewiki.net
4f2ff31a61
Localisation updates from https://translatewiki.net .
2018-04-19 09:20:05 +02:00
muxator
9daade0b95
fix: line numbers was not aligned with text
...
This change partially reverts 0a9d02562d#3280 .
Text size and line alignment are now reverted back to their 1.6.3
appearance (thus stay non customizable, for now).
Fixes #3378
2018-04-13 18:32:39 +02:00
translatewiki.net
6dc8ead8c9
Localisation updates from https://translatewiki.net .
2018-04-12 15:16:27 +02:00
translatewiki.net
686ce054fa
Localisation updates from https://translatewiki.net .
2018-04-12 09:12:18 +02:00
muxator
1d4e2b3b11
Release version 1.6.5
2018-04-10 00:47:40 +02:00
ilmar
517b249394
D
2018-04-10 00:08:42 +03:00
nashe
92eee85f36
Escape data when listing available plugins
2018-04-09 22:31:13 +02:00
Olivier Tétard
5b1e1f0c35
Fix typo in apicalls.js which prevents from importing isValidJSONPName.
2018-04-09 20:56:29 +02:00
ilmar
8502c04bee
html lists export fix
2018-04-09 15:37:28 +03:00
translatewiki.net
1fdb01fd75
Localisation updates from https://translatewiki.net .
2018-04-09 08:17:36 +02:00
John McLear
b16e7ad25e
unbreak Safari iOS line wrapping
...
fixes f5810957b4 (diff-f639eb4efeaabf5624f3229daa1e88cd)
2018-04-07 18:11:24 +01:00
John McLear
fba2bf4df9
Update iframe_editor.css
2018-04-07 17:50:45 +01:00
John McLear
6a38826e9d
Merge pull request #3366 from ether/release/1.6.4
...
Release/1.6.4
2018-04-07 11:05:31 +01:00
John McLear
fa83de778c
Password check fix
2018-04-07 10:31:47 +01:00
