658 commits

Author	SHA1	Message	Date
webzwo0i	5306f0c98a	wrap appendRevision in try-catch block	2014-12-04 16:05:02 +01:00
John McLear	6fea3a25f8	stop death on no session	2014-11-30 21:21:58 +00:00
John McLear	12f25d8a45	bump cleancss	2014-11-29 01:31:04 +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	c13301966f	yeah need htis too	2014-11-27 02:56:42 +00:00
John McLear	16f3ebb3ba	handle auth fails	2014-11-26 17:34:44 +00:00
John McLear	0a84379364	make additional line break at end of imported doc	2014-11-26 15:19:22 +00:00
John McLear	8851b8ab6b	Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away	2014-11-25 22:48:09 +00:00
John McLear	881763f663	remove jsdom dep	2014-11-25 22:15:29 +00:00
John McLear	77de2d918b	multiline	2014-11-25 22:14:48 +00:00
luto	5c3874c0a1	really recreate socketio-client in expressCreateServer, fixes #2342 ... When using plugins, the express server gets restarted. When we do that, the socketio-server should also get restarted. It doesn't. That means that all the events in SocketIORouter.js are bound twice, which causes chaos all over etherpad. This changes our socketio.js so it fully recreates the io-instance when we restart the server. introduced in 95e7b0f156, but catching that would have been hard.	2014-11-25 22:38:22 +01:00
John McLear	2a062f8dc3	mheh no browser requirement at all	2014-11-25 18:18:42 +00:00
John McLear	c2c0cb6907	so yeah, prolly can do this anyway?	2014-11-25 18:07:34 +00:00
John McLear	60d44cd3df	use cheerio instead of jsdom	2014-11-25 17:26:09 +00:00
John McLear	a3f6b2edb7	more fixes	2014-11-23 22:33:56 +00:00
John McLear	555d22245d	Merge pull request #2335 from ether/javascript-bower ... swap out jquery browser for bower but expose browser object to all pages...	2014-11-23 14:15:41 +00:00
John McLear	73bcbbcb89	final commit	2014-11-23 14:15:03 +00:00
John McLear	0eb7cc7864	Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc	2014-11-23 14:14:11 +00:00
John McLear	ae7da122d7	fix session management	2014-11-23 14:14:01 +00:00
John McLear	9b66c93d6b	swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well	2014-11-22 19:11:35 +00:00
John McLear	764b8af5e3	Merge pull request #2334 from luto/api-mystery-crash ... fix api mystery crash	2014-11-22 15:50:23 +00:00
luto	4eee89ad12	fix api mystery crash	2014-11-22 16:46:37 +01:00
John McLear	703440acd7	missing socketio fix	2014-11-21 00:11:50 +00:00
John McLear	3e8f3cd938	hrm I dont trust this security	2014-11-18 14:56:40 +00:00
John McLear	ff603d7b58	stability restored now to handle the auth issues	2014-11-18 14:12:02 +00:00
John McLear	020b636b1f	template of a semi-fix	2014-11-18 14:08:44 +00:00
John McLear	865829e159	Merge pull request #1682 from luto/fix-listSessionsOfGroup ... Don't error in listSessionsOfGroup when there are non-existing sessions	2014-11-15 16:25:23 +00:00
John McLear	3bf108f3b4	Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types ... Allow for a setting so you can stop unknown file types from being imported	2014-11-15 15:41:08 +00:00
John McLear	cce2d7279a	resolve merge issues	2014-11-15 15:34:18 +00:00
Cristo	0253156dbb	Update APIHandler.js	2014-11-12 19:55:37 +01:00
Cristo	f7dd756642	Update API.js	2014-11-12 19:53:56 +01:00
Cristo	f59238fe58	Update API.js	2014-11-12 19:50:43 +01:00
Cristo	24ac082cae	Update API.js	2014-11-12 19:49:08 +01:00
Cristo	9d39c9591a	update pad clients	2014-11-12 19:46:50 +01:00
Cristo	46bc328896	new api ver	2014-11-08 01:41:23 +01:00
Cristo	c33c6e085e	comment addded	2014-11-08 01:39:27 +01:00
Cristo	d246a191c6	Added option to restore revisions #1791	2014-11-08 01:12:40 +01:00
John McLear	053ff3097d	whoops I missed this one	2014-11-04 23:29:45 +00:00
John McLear	9fa77cdea2	working handling of setting client ip and anonymizing etc	2014-11-04 23:25:18 +00:00
John McLear	f418dfa205	fix author notification handler	2014-11-04 22:37:10 +00:00
John McLear	af3e8e5e15	fix room client leave	2014-11-04 22:34:43 +00:00
John McLear	8391f902fb	re-apply roomsize	2014-11-04 22:31:09 +00:00
John McLear	a6cbb4af40	working messages	2014-11-04 19:58:38 +00:00
John McLear	68eaa09708	Begin to repair damage done to rooms logic	2014-11-04 19:55:05 +00:00
John McLear	95e7b0f156	transports	2014-11-04 19:11:06 +00:00
John McLear	cb28d10963	move logging into debug environment variable .. sighs	2014-11-04 18:32:26 +00:00
John McLear	5d0ccb5f8f	auth fix	2014-11-04 18:17:39 +00:00
John McLear	adef0af227	more stuff required to stop it crashing, now we have identified what needs fixing we can fix it	2014-11-04 18:01:41 +00:00
John McLear	1e53c4f5f0	identify which parts are causing issues and comment them out, obviously this needs fixing	2014-11-04 17:57:18 +00:00
John McLear	2c801cc558	no errors but no connections	2014-11-01 22:36:19 +00:00