262 commits

Author	SHA1	Message	Date
Thomas Russell Murphy	b557927b72	Fix link to etherpad-lite on GitHub	2015-08-03 21:53:54 -05:00
Stéphane Alnet	0b3216ecb6	Do not extend Array.prototype	2015-05-22 12:27:08 +02:00
John McLear	757ad765d3	use removeItem instead of remove namespace	2015-05-22 11:09:21 +01:00
John McLear	41d24a8c8f	Merge branch 'develop' of github.com:ether/etherpad-lite into develop	2015-05-19 16:44:57 +01:00
John McLear	b662d5c618	dont show editing buttons in R/O view	2015-05-19 16:43:19 +01:00
Simon Gaeremynck	7fe99cccad	Using log4js in TidyHtml	2015-05-18 17:43:46 +01:00
Simon Gaeremynck	786b43efc8	Tidy HTML before trying to convert it with abiword	2015-05-18 16:24:41 +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
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
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
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
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	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
John McLear	5761e998de	first semi working alt f9 functionality	2015-03-25 11:03:45 +00:00
webzwo0i	a0fb65205c	oops, fix export with wildcards	2015-03-14 00:02:23 +01:00
John McLear	178309e10d	Merge branch 'develop' of github.com:ether/etherpad-lite into develop	2015-02-26 12:13:41 +00:00
John McLear	470b0ba2a6	Merge pull request #2520 from ether/load-testing-settings ... allow for load testing connections to hit by a setting	2015-02-22 14:41:09 +00:00
John McLear	d5bec1701e	fix export of bad pads and also limit import to files	2015-02-21 12:33:30 +00:00
John McLear	ec6a2b5ba9	allow for load testing connections to hit by a setting	2015-02-16 23:02:19 +00:00
webzwo0i	37924e441a	add try-catch clause around calls to applyToAText	2015-02-16 09:01:30 +01:00
John McLear	ddc69831b2	working, need to test though	2015-02-11 17:59:05 +00:00
John McLear	b9802616b6	use latest cleanCSS	2015-02-04 17:57:34 +00:00
Stefan	4c64b7a670	Revert 'asyncLineHTMLForExport' hook	2015-01-25 22:08:40 +01:00
John McLear	c798a27ad8	boop	2015-01-24 13:39:45 +00:00
John McLear	1890ba3976	working, might need polish its pretty late	2015-01-24 05:14:38 +00:00
John McLear	9abb85799c	realization how aCallAll works	2015-01-24 04:31:50 +00:00
John McLear	372063295f	beginning of a hook, needs docs etc	2015-01-24 04:09:13 +00:00
John McLear	6fd0285d4d	include lineContent in hok	2015-01-21 21:36:11 +00:00
John McLear	cb65224997	better logic for author handling	2015-01-21 00:28:00 +00:00
John McLear	5f9bbd0666	restrict expor4t to only expose this pad ID	2015-01-21 00:03:39 +00:00
John McLear	85fffbe14c	more handling	2015-01-19 02:57:10 +00:00
John McLear	cadb83ac5a	bumpage	2015-01-19 02:51:32 +00:00
John McLear	6bc74a9adb	more export logic handling	2015-01-18 23:33:29 +00:00
John McLear	e50ea6ffea	whoops proper regexp fix for listNumber	2015-01-18 23:24:20 +00:00
John McLear	bd9ff770fe	reset all numbers on first item	2015-01-18 23:21:34 +00:00
John McLear	af70902bef	support deeper nested elements on exports	2015-01-18 23:16:58 +00:00
John McLear	26c839063f	check file system that abiword exists	2015-01-04 14:47:08 +00:00