2096 commits

Author	SHA1	Message	Date
Egil Moeller	dade9520a4	Hooks can now be loaded as AMD	2015-04-12 11:32:59 +02:00
Egil Moeller	7a1f065702	More AMDificatioN	2015-04-11 23:08:09 +02:00
John McLear	4234681efd	merge latest develop	2015-04-11 16:16:03 +01:00
John McLear	e488d95aca	include requirejs in package file	2015-04-11 16:15:08 +01: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
Egil Moeller	9729af63e8	Cleanup	2015-04-11 16:57:58 +02:00
Tom Hunkapiller	133188320a	fix: only match /javascript/* for caching middleware	2015-04-11 09:54:40 -05:00
Egil Moeller	b86aa5d858	Hook modules can be in either CommonJS or AMD format, have to be AMD for client side	2015-04-11 16:51:01 +02: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
Egil Moeller	0e5cd65d8d	First baby steps towards requirejs	2015-04-11 13:22:27 +02: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