806 commits

Author	SHA1	Message	Date
Simon Gaeremynck	786b43efc8	Tidy HTML before trying to convert it with abiword	2015-05-18 16:24:41 +01:00
John McLear	9e9207d8b6	Merge pull request #2657 from simong/cookie-parser ... Use the cookie parser middleware	2015-05-11 15:10:45 +01:00
Simon Gaeremynck	5a7750781b	Use the cookie parser middleware	2015-05-07 18:35:21 +01:00
Xavid	9e86fb279b	Fix backend tests with new setText() implementation; tests depended ... on the old setText() behavior leaving the last character.	2015-05-06 08:45:22 -04:00
Xavid	5e64c292a4	When using setText(), replace the entire existing text of the pad, ... rather than replacing all except the last letter.	2015-05-05 14:18:27 -04:00
John McLear	4938c7be38	plugins always return html so use that endpoint	2015-04-29 20:54:41 +01:00
John McLear	1f471b0f81	show versions of plugins at startup, fixes #2642	2015-04-28 23:41:55 +01:00
John McLear	254edffa9c	fixes #2547	2015-04-24 14:17:49 +01:00
Andreas Åkre Solberg	ec7b3fc787	Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs	2015-04-22 20:29:19 +02:00
Tom Hunkapiller	6ff7d4e9a6	revert to old path handling, but strip out "..". fixes #2614	2015-04-15 14:31:21 -05:00
louis	0fa7650df8	dont allow directory traversal #2	2015-04-12 17:12:35 +02:00
John McLear	e3f95d0c9c	Merge pull request #2604 from ether/pad-options ... session key is now ignored and also padOptions are available in settings	2015-04-11 22:33:46 +01:00
Peter 'Pita' Martischka	fc0cac0cad	merge object settings into default settings	2015-04-11 22:01:46 +01:00
John McLear	8ed12c7776	session key is now ignored and also padOptions are available in settings	2015-04-11 21:22:00 +01:00
John McLear	4a70837de9	Merge pull request #2602 from devoidfury/fix/import-large-etherpad ... fix large etherpad import, fixes #2524	2015-04-11 20:09:01 +01:00
Stefan	43687f6e8b	Merge pull request #2601 from Gared/session_key_file ... Move sessionKey setting from settings.json to SESSIONKEY.txt	2015-04-11 19:10:18 +02:00
Tom Hunkapiller	a896d67e8c	make setPadRaw async; streamline .etherpad file import handling chain	2015-04-11 12:02:19 -05:00
Stefan	a3ed82ad06	Move sessionKey setting from settings.json to SESSIONKEY.txt	2015-04-11 18:45:14 +02:00
John McLear	25092fcb90	Merge pull request #2600 from devoidfury/fix/junk-binary-files ... fix: only match /javascript/* for caching middleware	2015-04-11 16:00:02 +01:00
Tom Hunkapiller	133188320a	fix: only match /javascript/* for caching middleware	2015-04-11 09:54:40 -05:00
John McLear	5ef22e649b	Merge pull request #2302 from Gared/create_pad_special_characters ... Add check for special url characters to createPad API function	2015-04-11 14:56:26 +01:00
Stefan	aa0d14c7d7	Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters	2015-04-11 12:10:37 +02:00
John McLear	acc1a0626a	use latest ejs	2015-04-11 09:53:27 +01:00
Tom Hunkapiller	0b0a349081	clearer comments about the path handling behavior	2015-04-11 09:05:51 +01:00
Tom Hunkapiller	5409eb314c	fix an issue in the path handling that allowed directory traversal	2015-04-11 09:05:32 +01:00
Tom Hunkapiller	2e4374c08d	clearer comments about the path handling behavior	2015-04-10 20:19:26 -05:00
Tom Hunkapiller	3ebb19d8a2	fix an issue in the path handling that allowed directory traversal	2015-04-10 20:03:00 -05:00
John McLear	402e53d88e	Merge pull request #2584 from devoidfury/express4 ... Express 4 support	2015-04-11 00:13:45 +01:00
Stefan	db5bdc8719	Log version number and git-sha on server start	2015-04-11 00:13:04 +02:00
Stefan	8e4c961207	Add version number to plugins-info page	2015-04-10 23:52:17 +02:00
John McLear	9d4e5f6e35	dont allow directory traversal	2015-04-10 22:02:22 +01:00
Tom Hunkapiller	fd1d285a77	fix the rest of the deprecation warnings	2015-04-10 14:18:30 -05:00
Tom Hunkapiller	6fad2ca39a	fix vulnerability	2015-04-10 06:16:17 -05:00
Tom Hunkapiller	de67714cf8	fix minify route path; update deprecated calls	2015-04-10 05:52:58 -05:00
Tom Hunkapiller	d0b39c01fb	update for express 4.x	2015-04-08 23:12:11 -05:00
John McLear	a5345524e1	Merge pull request #2566 from ether/editbar-accessibility ... Accessibility	2015-04-07 21:25:27 +01:00
John McLear	3a969f8dd8	pass error messages to pad text if shown during startup	2015-04-06 00:13:38 +01:00
John McLear	e027083136	timeslider settings for fonts	2015-04-05 15:18:36 +01:00
John McLear	ee5833b9c6	Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility	2015-04-02 00:05:25 +01:00
John McLear	27ae48686d	reintroduce removed api points that were removed by mistake	2015-04-01 13:56:52 +01:00
John McLear	32a09ff461	tests and fix up sloppy code by original author	2015-04-01 13:52:56 +01:00
John McLear	c705a058fb	Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api	2015-04-01 13:32:07 +01:00
John McLear	fef746e80e	fix import issue with txt files and abiword #2572	2015-04-01 00:19:42 +01:00
John McLear	0b90da19d2	Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility	2015-03-31 23:32:15 +01:00
John McLear	b404af7c17	Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition ... do not crash when encountering mismatched compositions. log the changese...	2015-03-31 23:17:51 +01:00
John McLear	e47992f5b7	Merge pull request #2538 from webzwo0i/check-author-attribution ... Check author attribution and fix clearAuthorship test	2015-03-31 23:14:22 +01:00
John McLear	662216b6cf	slightly different alt stuff	2015-03-31 16:36:44 +01:00
John McLear	ef38bcad9f	make buttons i18n friendly and a better experience	2015-03-31 13:57:18 +01:00
John McLear	7b726cbc02	more working logic and also pretty nice screen reader experience	2015-03-26 13:58:57 +00:00
John McLear	ec1956b4b6	read for button activity	2015-03-26 12:42:07 +00:00