muxator
1f19b20796
tests: move supertest among devDependencies in package.json
2018-07-28 23:54:51 +02:00
muxator
cb8275fc4b
docs: trivial corrections to test documentation
2018-07-28 23:54:51 +02:00
muxator
a3ae374a67
installDeps: made version detection more robust. Require Node >= 6.9, npm >= 3.10
...
require_minimal_version() tries to parse semvers in a Posix portable way and
ensure a minimal Major.minor version is met.
2018-07-28 23:33:24 +02:00
muxator
a69f8a3db9
runtime: deprecate Node <= 7. From Etherpad 1.8.0 minimum Node version will be 8
2018-07-28 23:33:24 +02:00
muxator
7544585908
runtime: enforce minimal node version to 6.9.0
...
Etherpad 1.6.6 does not run on node <= 5 already.
Node 6.9 is the first LTS release in the 6 series, and comes with npm 3.10.8.
Declarations in package.json are advisory unless the user has set
`engine-strict` config flag.
Updated the docs accordingly.
2018-07-28 23:33:24 +02:00
muxator
f1056bf01a
docs: minimal revision
2018-07-27 00:42:13 +02:00
translatewiki.net
7fa198d448
Localisation updates from https://translatewiki.net .
2018-07-26 10:04:02 +02:00
muxator
42e0646327
Merge Firefox frontend test fixes
...
The fix was done on another branch to show that it completely solves tests
failures introduced by 2be873e3c7
.
All remaining failures in this branch are due to other changes made after
**1.6.6**, namely from fe08d2a1db
included onwards.
2018-07-21 14:16:20 +02:00
muxator
4580537537
tests: fix frontend tests on firefox
...
These changes make the frontend tests send keydown instead of keypress in
firefox, in accordance with #3413 (Use keydown instead of keypress on Firefox).
The percentage of passing frontend in Firefox 61 on this revision is 100%.
2018-07-20 23:58:47 +02:00
John McLear
a4c67f0d03
Update package.json
2018-07-20 17:54:48 +01:00
muxator
60c1036ecb
changelog: put <ol> in backticks
...
Github's Markdown renderer broke the layout of the readme file.
Putting `<ol>` in backticks keeps it happy.
2018-07-20 12:33:45 +02:00
Mantary
f17fe571df
Use keydown instead of keypress on Firefox (cherry pick from 2be873e3c7
)
...
This puts issue: #3383 , PR: #3413 (Use keydown instead of keypress on Firefox)
directly on top of bacc37cf9b
, which is the last commit before fe08d2a1db
merged #3268 (getLineHTMLForExport - Fixes #2486 but breaks plugins).
This is necessary for showing that:
- bacc37cf9b
was passing client side tests on firefox
Visit `http://<yourhost>/tests/frontend/` using firefox.
- 2be873e3c7
forgot to update the client side tests. You cannot test it since
that commit was mad on top of other changes, hence this graft
- in this commit there are 20 failures with firefox:
passes: 82 failures: 20 duration: 261.84s
2018-06-28 16:41:06 +09:00
translatewiki.net
bacc37cf9b
Localisation updates from https://translatewiki.net .
2018-05-21 16:02:15 +02:00
Wikinaut
6dd172d6b7
Update settings.json.template
2018-05-12 21:48:21 +02:00
Wikinaut
784bd8c7cc
Update settings.json.template
...
harmonizing the database name. "store" is the table name - not to be used here! Database name must not contain "-", but can contain "_". See https://github.com/ether/etherpad-lite/wiki/How-to-use-Etherpad-Lite-with-MySQL
2018-05-12 21:48:21 +02:00
muxator
bfec44e346
Release version 1.6.6
2018-05-05 00:53:59 +02:00
muxator
e13ae0aec5
changelog: better specified CVE description
...
Previous commit was wrong.
Fixes #3372 , really.
2018-05-04 23:24:58 +02:00
muxator
10d555bc91
changelog: better specified CVE description
...
fixes #3372
2018-05-04 23:15:22 +02:00
muxator
6dbeca217e
createRelease.sh: changelog editing failed for multiline messages
...
sed does not accept multiline strings in its replacement text.
Let's replace newlines with literal "\n" in modify_files()
2018-05-04 00:36:09 +02:00
muxator
903a2c8e43
createRelease.sh: added error checking in modify_files()
...
Otherwise, when inserting a multiline changelog sed would with this message:
sed: -e expression #1 , char 27: unterminated `s' command
And the script would continue with an unmodified CHANGELOG.md
For simmetry, added the same check to package.json, too
2018-05-03 23:54:08 +02: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
, which got released in 1.6.4
due to #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
3eb3e301a2
manually updated CHANGELOG.md
...
due to createRelease.sh not catching an error from sed and continuing:
sed: -e expression #1 , char 66: unterminated `s' command
2018-04-10 00:50:28 +02:00
muxator
1d4e2b3b11
Release version 1.6.5
2018-04-10 00:47:40 +02: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
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
4c16ac4b47
Merge pull request #3367 from ether/master
...
Merge in 1.6.4
2018-04-07 11:05:58 +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
Peter 'Pita' Martischka
6d5dc93dbf
merged
2018-04-07 10:23:49 +01:00
John McLear
0132f4d1da
Include CVE #
2018-04-07 10:13:09 +01:00
John McLear
c34350f307
Beginning to make release
2018-04-07 09:22:13 +01:00
John McLear
76cd39d11a
Merge pull request #17 from nashe/patch-admin-bypass
...
Case-insensitive check /admin/ access restriction
2018-04-06 21:27:16 +01:00
thomas
ffe24c3dd9
Update webaccess.js
2018-04-06 22:21:33 +02:00
John McLear
e9f77e06a9
Merge branch 'develop' of https://github.com/ether/etherpad-lite into develop
2018-04-06 13:52:22 +01:00
John McLear
86ec963775
Fixes #3137
...
#3137
2018-04-06 13:52:04 +01:00