5076 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stefan	423d8e584e	Merge pull request #3103 from ether/master ... Master to develop	2016-12-23 23:12:32 +01:00
Stefan	9f51432175	Update CHANGELOG.md	2016-12-23 22:12:18 +01:00
Stefan	8992dd665a	Merge new release into master branch!	2016-12-23 22:00:34 +01:00
Stefan	6dc808ad54	Release version 1.6.1	2016-12-23 21:59:57 +01:00
Stefan	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
Stefan	caabb4d8f7	Update nodejs for windows to 6.9.2	2016-12-22 23:15:49 +01:00
Stefan	be9ff4a0de	Fixed crash on invalid export url	2016-12-22 23:04:06 +01:00
Stefan	efb25f417a	Merge pull request #2993 from ether/fixes-2945 ... fixes #2945	2016-12-20 22:08:05 +01:00
Stefan	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
Stefan	db21a25eff	Merge pull request #3000 from Gared/improve_cookies ... Improve cookies	2016-12-20 22:00:12 +01:00
Stefan	8084400e13	Try to init cookies before testing if it exists	2016-12-20 21:57:01 +01:00
Stefan	aefa617797	Merge branch 'develop' into improve_cookies	2016-12-20 21:31:11 +01:00
Stefan	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
Niklas Laxström	db94ce9413	Localisation updates from https://translatewiki.net.	2016-12-19 07:36:35 +01:00
Niklas Laxström	d13a28a1ea	Localisation updates from https://translatewiki.net.	2016-12-15 07:31:34 +01:00
Luiza Pagliari	01d23b1f6a	Merge pull request #2929 from xavidotron/develop ... Pass through the "item" parameter to registerAceCommand callbacks.	2016-12-13 06:12:26 -02:00
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