171 commits

Author	SHA1	Message	Date
Stefan	14e1f3bf22	Update socket.io to version 1.4.5	2016-04-26 18:55:58 +02:00
Stefan	ebe44b0eab	Release version 1.6.0	2016-04-24 21:03:42 +02:00
John McLear	239f517afd	Update package.json	2016-01-03 01:03:05 +00:00
John McLear	577102b025	license	2015-12-21 16:29:09 +00:00
John McLear	e98821cef7	bump socketio	2015-12-07 13:48:05 +00:00
Stefan	93fd05ba02	Release version 1.5.7	2015-08-05 19:15:27 +02:00
Stefan	2393ea01f0	Release version 1.5.6	2015-04-16 23:06:24 +02:00
Stefan	64d94cb346	Release version 1.5.5	2015-04-13 17:27:14 +02:00
John McLear	4d009ba445	bump underscore and require kernel	2015-04-11 11:32:46 +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
John McLear	402e53d88e	Merge pull request #2584 from devoidfury/express4 ... Express 4 support	2015-04-11 00:13:45 +01:00
Stefan	d3277deafc	Increase etherpad version to 1.5.3	2015-04-11 00:32:18 +02:00
Tom Hunkapiller	d0b39c01fb	update for express 4.x	2015-04-08 23:12:11 -05: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
Simon Gaeremynck	9bde17b91c	Bumped ueberDB to 0.2.14 so Cassandra suport is included	2015-03-22 12:27:54 +00:00
John McLear	4e0353b3ef	bump ueber	2015-03-02 08:59:53 +00:00
John McLear	38a4f1be5f	bump ueberdb	2015-02-26 12:14:01 +00:00
John McLear	e39b442840	bump v for #2505 fix	2015-02-13 01:25:29 +00:00
John McLear	b9802616b6	use latest cleanCSS	2015-02-04 17:57:34 +00:00
John McLear	9afcd89167	bump versions to see if it's stable	2015-02-04 17:52:27 +00:00
John McLear	b6e7ddf874	bump v	2015-01-26 16:11:15 +00:00
John McLear	7237a3b7cc	bump ueberdb	2015-01-21 14:58:47 +00:00
John McLear	531d25ab84	freeze deps	2015-01-20 23:50:55 +00:00
John McLear	73d6030762	boop	2015-01-19 00:36:12 +00:00
John McLear	c0a4051b7a	use etherpads own yajsml	2015-01-18 20:12:02 +00:00
John McLear	a553b44dbc	refix plugins	2015-01-11 23:59:18 +00:00
Timothy Gu	9b9a747167	Support ejs 2.0 ... Fixes #2437. This is still relying on undocumented behavior, but should unbreak the app in the mean time.	2015-01-11 08:17:17 -08:00
John McLear	f2c443809f	roll ejs back as its broken at v2	2015-01-07 15:18:54 +00:00
John McLear	45e90e138c	v number bump	2015-01-01 16:57:31 +00:00
John McLear	ee3f3b8060	move clean css back to fix minification on TS	2014-12-21 23:42:56 +00:00
John McLear	12f25d8a45	bump cleancss	2014-11-29 01:31:04 +00:00
John McLear	74ffbdea79	bump vs	2014-11-28 18:02:11 +00:00
John McLear	3224122f7e	correct kernel v#	2014-11-28 17:47:55 +00:00
John McLear	3bf9f3cf1d	Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change	2014-11-28 17:43:01 +00:00
John McLear	61c6deda2e	use a forked require-kernel	2014-11-27 02:44:48 +00:00
John McLear	cff8f4a61e	remember to add supertest	2014-11-26 21:58:27 +00:00
John McLear	88b3d99fbd	Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests	2014-11-26 15:33:13 +00:00
John McLear	a4be5b4fd7	mocha version	2014-11-26 01:03:57 +00:00
John McLear	ad7de8277d	mocha	2014-11-25 22:12:25 +00:00
John McLear	60d44cd3df	use cheerio instead of jsdom	2014-11-25 17:26:09 +00:00
John McLear	4986dd11ee	merging	2014-11-15 15:39:46 +00:00
John McLear	cce2d7279a	resolve merge issues	2014-11-15 15:34:18 +00:00
John McLear	3eb0652b21	fix pg	2014-11-06 16:38:31 +00:00
John McLear	57f56d8fe1	bump express to a working version	2014-11-04 23:42:40 +00:00
John McLear	b61d8d99d1	Update package.json	2014-11-03 17:15:22 +00:00
John McLear	a67e805da0	basics, still not working	2014-11-01 21:25:49 +00:00