Commit Graph

5089 Commits (8247d5eef37500589d8c409cf96cf51506e4e71a)

Author SHA1 Message Date
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 `@import`ing. 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
ilmar 016497dbb4 prevLine/nextLine check fix 2018-05-14 22:57:15 +03: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
ilmar 517b249394 D 2018-04-10 00:08:42 +03:00
ilmar 8502c04bee html lists export fix 2018-04-09 15:37:28 +03:00
ilmar b4ad7cf452 Export lists fix + code linting and readability update 2018-04-05 23:27:02 +03:00
Mikk Andresen 64a2e5b7a3 Upgrade Ueberdb2 to 0.3.7 to fix https://github.com/ether/etherpad-lite/issues/3348 2018-04-04 13:52:59 +03:00
Mikk Andresen 20428bb427 Merge remote-tracking branch 'upstream/develop' into develop 2018-04-04 13:52:27 +03:00
Mikk Andresen a67aaa8f49 Merge remote-tracking branch 'upstream/master' into develop 2018-04-04 13:52:08 +03:00
Mikk Andresen a4819b21f2 Upgrade Ueberdb2 to 0.3.7 to fix https://github.com/ether/etherpad-lite/issues/3348 2018-04-04 13:40:02 +03:00
Mikk Andresen 6f2466bebc Merge with upstream develop. 2018-04-02 13:47:16 +03:00
ilmar cf82177b36 ueberDB2 update 2018-03-26 17:57:00 +03:00
ilmar 30400509ba added tiblus ep_prefs_different_cookie_for_different_protocol 2017-11-03 10:47:54 +02:00
ilmar 76f211b0bf ExportHtml.js update 2017-11-01 09:48:23 +02:00
ilmar 5469ce85cd exportHTML update 2017-10-31 22:46:24 +02:00
ilmar 724b1d734b updated html export, run hooks also with lists 2017-10-31 16:23:41 +02:00