d48395089c
Update called from for two hooks
...
`expressCreateServer` and `expressConfigure` are called from `express.js`, not
from `server.js`.
2017-01-17 14:59:24 +01:00
d65ab4d80b
Merge pull request #3122 from tpltnt/freebsd-pkg-fix
...
readme: added curl as dependency
2017-01-12 18:21:33 -02:00
6e1bf9dc90
added curl as dependency
2017-01-12 20:50:31 +01:00
520f257ed1
[chore] Use helper plugin when running tests on Travis
...
This plugin allows us to test code related to plugins, like testing
issues that only happen when we have plugins using line attribs, for
example (see #3118 ).
2017-01-12 13:04:32 -02:00
b2d9f57338
[fix] Consider line attribs of plugins when building changesets
...
When checking the places on text that are identical between content
before and after a changeset, we were considering only the standard
(Etherpad-core) attributes, and not taking into account attributes
created by the plugins. One consequence was that the '*' marker of lines
with line attribs were being kept, even when the new lines have
different line attribs. See #3118 for more details.
Fix #3118 .
2017-01-12 12:42:56 -02:00
deed74c8c8
Localisation updates from https://translatewiki.net .
2017-01-02 09:00:13 +01:00
f217e29071
Localisation updates from https://translatewiki.net .
2016-12-29 08:24:55 +01:00
087d4ad95c
Merge pull request #3106 from alxlo/develop
...
minor changes in docs
2016-12-27 10:12:07 -02:00
cd7f01f40a
minor changes in docs
...
- correct link to doc generation tool.
- fixed incomplete sentence regarding API client libraries
2016-12-26 20:18:34 +01:00
423d8e584e
Merge pull request #3103 from ether/master
...
Master to develop
2016-12-23 23:12:32 +01:00
9f51432175
Update CHANGELOG.md
2016-12-23 22:12:18 +01:00
8992dd665a
Merge new release into master branch!
2016-12-23 22:00:34 +01:00
6dc808ad54
Release version 1.6.1
2016-12-23 21:59:57 +01:00
b8a4648d6d
Merge pull request #3101 from Gared/fix_crash_on_invalid_export
...
Fixed crash on invalid export url
2016-12-23 21:14:56 +01:00
caabb4d8f7
Update nodejs for windows to 6.9.2
2016-12-22 23:15:49 +01:00
be9ff4a0de
Fixed crash on invalid export url
2016-12-22 23:04:06 +01:00
efb25f417a
Merge pull request #2993 from ether/fixes-2945
...
fixes #2945
2016-12-20 22:08:05 +01:00
a1ec061017
Merge pull request #3053 from danfuzz/fix-timeslider-lists
...
Fix timeslider lists / indents, but also make CSS `@import` work
2016-12-20 22:06:31 +01:00
db21a25eff
Merge pull request #3000 from Gared/improve_cookies
...
Improve cookies
2016-12-20 22:00:12 +01:00
8084400e13
Try to init cookies before testing if it exists
2016-12-20 21:57:01 +01:00
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
368bbe4836
Merge pull request #3084 from Gared/fix_npm_node7
...
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-12-20 00:07:26 +01:00
db94ce9413
Localisation updates from https://translatewiki.net .
2016-12-19 07:36:35 +01:00
d13a28a1ea
Localisation updates from https://translatewiki.net .
2016-12-15 07:31:34 +01:00
01d23b1f6a
Merge pull request #2929 from xavidotron/develop
...
Pass through the "item" parameter to registerAceCommand callbacks.
2016-12-13 06:12:26 -02:00
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
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
b41b4726d6
Localisation updates from https://translatewiki.net .
2016-11-24 08:24:37 +01:00
352cec1811
Updated socket.io to 1.6.0
2016-11-20 12:44:59 +01:00
d1d2e462d0
Updated node for windows build to version 6.9.1
2016-11-20 12:32:36 +01:00
39a3bedb7b
Updated option parameters for socket.io to work with latest version
2016-11-20 12:27:27 +01:00
00c9caf7a3
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-11-20 11:28:17 +01:00
602fd4629a
Localisation updates from https://translatewiki.net .
2016-11-17 09:50:45 +01:00
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
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
0497e12d7b
Merge pull request #3077 from pcarver/typo-fix
...
Correct the spelling of occured to occurred
2016-11-14 10:50:18 -02:00
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
223127bf39
Localisation updates from https://translatewiki.net .
2016-11-01 07:59:29 +01:00
7dd934f714
Localisation updates from https://translatewiki.net .
2016-10-17 20:19:22 +02:00
2c69511c62
Localisation updates from https://translatewiki.net .
2016-10-13 08:00:32 +02:00
965af5a40b
Localisation updates from https://translatewiki.net .
2016-10-06 07:41:01 +02:00
428e0cdbc2
Merge pull request #3044 from rugk/patch-3
...
Add Referrer-Policy (no-referrer)
2016-09-30 23:49:21 +02:00
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
...
Conflicts:
src/templates/index.html
2016-09-30 19:20:40 +02:00
f289611ba9
Merge pull request #3059 from paper-pauper/librejs
...
Added LibreJS support
2016-09-28 23:02:40 +01:00
93ca44f005
Localisation updates from https://translatewiki.net .
2016-09-27 13:58:36 +02:00
b6e5a2283b
Localisation updates from https://translatewiki.net .
2016-09-22 07:27:50 +02:00
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +02:00
32eb6a2288
Localisation updates from https://translatewiki.net .
2016-09-15 08:18:13 +02:00
7ecf240d9e
Localisation updates from https://translatewiki.net .
2016-09-13 07:44:27 +02:00
0a9d02562d
Handle relative paths properly, when `@import`ing.
2016-09-09 12:59:02 -07:00
Sjoerd Langkemper
Luiza Pagliari
tpltnt
Niklas Laxström
Alexander Lorz
Stefan
Stefan
Siebrand Mazeland
Luc Didry
Paul Carver
rugk
John McLear
Nobody Really
Dan Bornstein