2161 commits

Author	SHA1	Message	Date
John McLear	1f471b0f81	show versions of plugins at startup, fixes #2642	2015-04-28 23:41:55 +01:00
John McLear	799b086216	Merge pull request #2641 from lpagliari/develop ... Fix the way Content Collector gets the node class. Fixes #2640	2015-04-28 23:05:39 +01:00
John McLear	dbb2956d2f	allow chrome to use control shift 1 to send ordered list	2015-04-28 15:48:12 +01:00
Luiza Pagliari	58ab17bf9e	Fix the way Content Collector gets the node class. Fixes #2640	2015-04-28 05:31:07 -07:00
John McLear	254edffa9c	fixes #2547	2015-04-24 14:17:49 +01:00
John McLear	b349a4f226	probably fixes #2625	2015-04-23 17:49:08 +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
John McLear	b8192fd015	first attempt at fixing dead keys, it cant be this easy can it?	2015-04-17 17:01:15 +01:00
Stefan	2393ea01f0	Release version 1.5.6	2015-04-16 23:06:24 +02:00
Tom Hunkapiller	6ff7d4e9a6	revert to old path handling, but strip out "..". fixes #2614	2015-04-15 14:31:21 -05:00
Stefan	64d94cb346	Release version 1.5.5	2015-04-13 17:27:14 +02:00
John McLear	629f909d57	add some semicoolons to prevent chrome warning	2015-04-13 10:52:15 +01:00
louis	0fa7650df8	dont allow directory traversal #2	2015-04-12 17:12:35 +02:00
John McLear	6a027d88a9	fix older IEs	2015-04-12 13:00:01 +01:00
John McLear	5435063a2f	re-fix rtl	2015-04-12 10:35:24 +01: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
John McLear	27aa71f3a4	IE list fixes	2015-04-11 13:16:45 +01:00
John McLear	34c5441392	msg to self	2015-04-11 11:37:20 +01:00
John McLear	4d009ba445	bump underscore and require kernel	2015-04-11 11:32:46 +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	14fab9f441	FF middle click fix	2015-04-11 10:45:51 +01:00
John McLear	2ca0214661	bump versions outdated	2015-04-11 10:24:50 +01:00
Stefan	a69b2a9cd1	Merge pull request #2596 from ether/master ... Master	2015-04-11 10:55:26 +02:00
John McLear	acc1a0626a	use latest ejs	2015-04-11 09:53:27 +01:00
Stefan	1b9a51c879	Release version 1.5.4	2015-04-11 10:19:02 +02: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	d47e201232	Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3	2015-04-11 00:49:26 +02:00
Stefan	d3277deafc	Increase etherpad version to 1.5.3	2015-04-11 00:32:18 +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
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	7b86eb09bc	new fix for #1766	2015-04-08 09:24:19 +01:00
John McLear	a5345524e1	Merge pull request #2566 from ether/editbar-accessibility ... Accessibility	2015-04-07 21:25:27 +01:00
John McLear	a2e6a1bb4f	Merge pull request #2579 from ether/warnings-in-pad-contents ... pass error messages to pad text if shown during startup	2015-04-07 21:24:47 +01:00
John McLear	7e99724fec	Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility	2015-04-06 13:19:42 +01:00
John McLear	a5aa58e28b	bump ueber	2015-04-06 13:18:44 +01:00
John McLear	e0270d0ba8	bump vs	2015-04-06 13:16:21 +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	56ce8e80ac	hacky fix for opendyslexic	2015-04-05 14:50:53 +01:00
John McLear	41bb4ef094	support for open dyslexic font	2015-04-05 14:03:09 +01:00
John McLear	e49bb4017c	use ctrl shift 2 instead of alt a	2015-04-05 13:42:26 +01:00
John McLear	db0bcdd696	fix issue where focus on timeslider wouldnt work	2015-04-05 13:39:20 +01:00
John McLear	c65ddad7d6	title for chat	2015-04-03 13:06:03 +01:00
John McLear	9090d76dcf	temp solution for alt 9 to show editbar label	2015-04-03 12:33:31 +01:00
John McLear	f79e2c7de2	final accessibility for Timeslider hopefully	2015-04-03 12:29:47 +01:00
John McLear	139edceb66	Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility	2015-04-02 16:50:43 +01:00
John McLear	85fc012bac	change to alt shit and a to show authors	2015-04-02 15:13:16 +01:00
John McLear	900595355f	Merge branch 'develop' of github.com:ether/etherpad-lite into develop	2015-04-02 13:17:01 +01:00
John McLear	644536b27b	fix for #2574	2015-04-02 13:16:49 +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	f6b4b5603d	fix timeslider title issues	2015-04-02 00:03:34 +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	70fdc7dcd7	Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection ... Re-implement ace_getAttributeOnSelection	2015-03-31 23:21:49 +01:00
John McLear	b6ff1807da	Merge pull request #2482 from ether/chrome-list-handling ... chrome list handling fix for #2412	2015-03-31 23:19:47 +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	64a89a3ec0	Merge pull request #2541 from cristo-rabani/patch-3 ... fixed + support for value	2015-03-31 22:58:10 +01:00
John McLear	4397191f55	Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position ... feature #2558 get attributes on position	2015-03-31 22:46:00 +01:00
John McLear	e9d8c3b53a	expose method for getting a full user list on the client including historical data	2015-03-31 20:26:55 +01:00
John McLear	64034ee1c6	doh caps	2015-03-31 18:50:50 +01:00
John McLear	48862dac6f	better handling for inputs and left and right arrows	2015-03-31 18:50:20 +01:00
John McLear	37c7c7eabe	i18n for timeslider steppers	2015-03-31 17:06:04 +01:00
John McLear	662216b6cf	slightly different alt stuff	2015-03-31 16:36:44 +01:00
John McLear	498e7f4961	MVP of alt A behavior to show author of line	2015-03-31 16:12:05 +01:00
John McLear	24e6e1728a	I came to bring the rain.. Let me get my coat... Fix focus on timeslider import export	2015-03-31 15:00:43 +01:00
John McLear	73073dcbc1	Timeslider accessibility and Bugfixes	2015-03-31 14:47:00 +01:00
John McLear	0f0a6c73ac	make user list a document so it's easy to navigate by screen readers	2015-03-31 14:11:49 +01:00
John McLear	3126d7196e	fix alt and focus issues	2015-03-31 14:06:02 +01:00
John McLear	ef38bcad9f	make buttons i18n friendly and a better experience	2015-03-31 13:57:18 +01:00
John McLear	35948989b3	make Alt C and Alt F9 and Escape work from anywhere	2015-03-31 13:45:11 +01:00
John McLear	a82e692bdd	dont use nasty settimeouts use a callback instead for focus	2015-03-31 13:21:41 +01:00
Thomas Muehlichen	a930161cb9	feature #2558 added documentation	2015-03-31 10:58:47 +02:00
John McLear	f9071aebe6	fix issue with showControls false not working	2015-03-30 14:56:35 +01:00
Thomas Muehlichen	1c05933dc9	Feature #2567 Added workaround to enable contentcollector to write key-value attributes	2015-03-26 18:49:35 +01:00
John McLear	19e83d5405	much better chat focus toggle behavior	2015-03-26 16:58:13 +00:00
John McLear	428b547d24	alt c to focus on chat and gritter and chat both now work with aria	2015-03-26 16:44:22 +00:00
John McLear	548cef7018	more keyboard support while in editbar	2015-03-26 14:26:21 +00:00
John McLear	6b88c037b8	fix firefox button styling	2015-03-26 14:11:37 +00:00