Commit graph

5060 commits

Author SHA1 Message Date
Stefan
da5ae8b1f7 Merge pull request #3085 from Gared/fix_socketio_options
Updated option parameters for socket.io to work with latest version
2016-12-12 23:40:29 +01:00
Stefan
9d3f5781eb Merge pull request #3086 from Gared/update_node_for_windows
Updated node for windows build to version 6.9.1
2016-11-30 19:32:46 +01:00
Niklas Laxström
b41b4726d6 Localisation updates from https://translatewiki.net. 2016-11-24 08:24:37 +01:00
Stefan
352cec1811 Updated socket.io to 1.6.0 2016-11-20 12:44:59 +01:00
Stefan
d1d2e462d0 Updated node for windows build to version 6.9.1 2016-11-20 12:32:36 +01:00
Stefan
39a3bedb7b Updated option parameters for socket.io to work with latest version 2016-11-20 12:27:27 +01:00
Stefan
00c9caf7a3 Updated npm to 4.0.2 and removed recursive searching for ep-plugins 2016-11-20 11:28:17 +01:00
Siebrand Mazeland
602fd4629a Localisation updates from https://translatewiki.net. 2016-11-17 09:50:45 +01:00
Luiza Pagliari
c76af79471 Merge pull request #3080 from ldidry/document-undocumented-API-function-restoreRevision
Add undocumented API function restoreRevision to doc
2016-11-16 19:34:12 -02:00
Luc Didry
2341d09807 Add undocumented API function restoreRevision to doc
This commit is dedicated to Schoumi. Thx for supporting me on Tipeee :-)
2016-11-16 10:36:18 +01:00
Luiza Pagliari
0497e12d7b Merge pull request #3077 from pcarver/typo-fix
Correct the spelling of occured to occurred
2016-11-14 10:50:18 -02:00
Paul Carver
573b55af8b Correct the spelling of occured to occurred
The correct spelling is occurred. See
http://www.gingersoftware.com/english-online/spelling-book/misspelling/occurred-occured-ocurred
or other dictionary search results.
2016-11-11 12:46:40 -05:00
Niklas Laxström
223127bf39 Localisation updates from https://translatewiki.net. 2016-11-01 07:59:29 +01:00
Niklas Laxström
7dd934f714 Localisation updates from https://translatewiki.net. 2016-10-17 20:19:22 +02:00
Niklas Laxström
2c69511c62 Localisation updates from https://translatewiki.net. 2016-10-13 08:00:32 +02:00
Niklas Laxström
965af5a40b Localisation updates from https://translatewiki.net. 2016-10-06 07:41:01 +02:00
Stefan
428e0cdbc2 Merge pull request #3044 from rugk/patch-3
Add Referrer-Policy (no-referrer)
2016-09-30 23:49:21 +02:00
rugk
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
Conflicts:
	src/templates/index.html
2016-09-30 19:20:40 +02:00
John McLear
f289611ba9 Merge pull request #3059 from paper-pauper/librejs
Added LibreJS support
2016-09-28 23:02:40 +01:00
Niklas Laxström
93ca44f005 Localisation updates from https://translatewiki.net. 2016-09-27 13:58:36 +02:00
Niklas Laxström
b6e5a2283b Localisation updates from https://translatewiki.net. 2016-09-22 07:27:50 +02:00
Nobody Really
97fd1ab2fe Added LibreJS support 2016-09-20 09:30:35 +02:00
Niklas Laxström
32eb6a2288 Localisation updates from https://translatewiki.net. 2016-09-15 08:18:13 +02:00
Niklas Laxström
7ecf240d9e Localisation updates from https://translatewiki.net. 2016-09-13 07:44:27 +02:00
Dan Bornstein
2a876e5e9b Ensure that all lines in the pad are marked with class ace-line.
Without this change, lines that haven't ever been edited will have either
an empty class or, in the case of list start lines, a class that begins
with a space (because the `ace-line` before the space never got added).
2016-09-13 01:17:04 +02:00
muxator
f2b5f3bca2 tests: print expected & received output for 'getHTML'
This test was broken by #3268 (getLineHTMLForExport - Fixes #2486 but breaks
plugins). This change aims to facilitate debugging.

Expected:
<!doctype html><html><body><ul class="bullet"><li>one</li><li>2</li></ul><br><ul><ul class="bullet"><li>ul2</li></ul></ul></body></html>

Received:
<!doctype html><html><body><ul class="bullet"><li>one</li><li>2</ul><br><ul class="bullet"><li><ul class="bullet"><li>ul2</ul></li></ul></body></html>
2018-07-17 00:46:52 +02:00
translatewiki.net
7c971f24aa Localisation updates from https://translatewiki.net. 2018-07-16 16:51:53 +02:00
Dan Bornstein
0a9d02562d Handle relative paths properly, when @importing. 2016-09-09 12:59:02 -07:00
Dan Bornstein
d7940cf8c5 Harmonize list- and indent-related CSS in the pad editor and timeslider.
* Add a new file `lists_and_indents.css` to hold the common CSS.
* Remove the corresponding CSS from `iframe_editor.css`, replacing it with
  an `@import` of the new file.
* Remove the list/indent code from `timeslider.css`, which was _unlike_ the
  corresponding editor CSS code, again replacing it with an `@import` of the
  new file.
2016-09-09 12:33:46 -07:00
Dan Bornstein
a5a7ebea3d Handle @import during CSS minification.
This meant plumbing a callback through to `compressCSS()`, which meant that
I had to alter the innards of `getFileCompressed()`. I tried to	leave that
function looking more understandable than when I found it; for example,	I
flattened out the nested `if`.

I went ahead and upgraded the version of `clean-css` while I was in the
territory.
2016-09-09 12:32:24 -07:00
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
c4918efc1b installDeps.sh: do not modify package.json when installing dependencies
installDeps.sh's only side effect should be to actually install dependencies
according to a configuration file, and not to modify it.

Adding --no-save to the npm command line forces npm to have a read only access
to package.json.

Old npm versions seem to support --no-XXX style flags even if not documented
(see https://github.com/npm/npm/issues/14285#issuecomment-254298519)

Tested with npm 3.5.2 and 6.1.0

Fixes #3396
2018-07-14 17:54:26 +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
Luiza Pagliari
7729e5a1a9
[fix:test] Use promise chain instead of chain (is deprecated) (#3419)
Fix warning when running tests: "chain api has been deprecated, use
promise chain instead."
2018-07-09 17:09:02 -03:00
John McLear
ad898b701a
Update README.md 2018-07-09 15:45:46 +01: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
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