487 commits

Author	SHA1	Message	Date
John McLear	5ba3cab445	better take some responsibility	2014-12-30 00:13:01 +01:00
John McLear	ac4f9eb4ce	licensing	2014-12-30 00:12:26 +01:00
John McLear	99a239fa9a	remove console log	2014-12-30 00:10:08 +01:00
John McLear	b8648b4a49	remove error logging	2014-12-29 23:08:42 +01:00
John McLear	a6400b3f61	allow only for pads less than 10 to be overwritten	2014-12-29 22:02:24 +01:00
John McLear	ab5e7381a2	working for all files	2014-12-29 21:35:10 +01:00
John McLear	3773b6346b	semi working requires browser refresh	2014-12-29 20:57:58 +01:00
John McLear	3fe802077c	Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-twice ... disconnect client if it submits an already accepted changeset based on a...	2014-12-29 02:01:03 +01:00
John McLear	c4959b089f	resolve merge conflict	2014-12-29 01:54:44 +01:00
John McLear	8603fb4583	fix sockets of switch to pad	2014-12-29 00:46:47 +01:00
John McLear	6b1fee400d	Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest	2014-12-29 00:40:07 +01:00
Gared	9cf19b99fe	Fix missing callback of #2400 and ignore missing author on timeslider on client-side	2014-12-27 22:25:24 +01:00
John McLear	7df944b3fd	Merge pull request #2404 from webzwo0i/sanity-in-atext ... block changeset if it deletes more lines than exist in the whole pad	2014-12-27 18:36:13 +01:00
Stefan	a645aeef5c	Merge pull request #2400 from Gared/fix/author-not-set ... Prevent server crash if author is not set	2014-12-27 16:15:26 +01:00
Gared	40c7ee9df9	Prevent server crash if author is not set	2014-12-27 14:26:05 +01:00
John McLear	ae22332f71	removing dokuwiki	2014-12-27 14:08:45 +01:00
webzwo0i	b204aa2085	remove more dead requires.	2014-12-16 19:10:01 +01:00
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	16f3ebb3ba	handle auth fails	2014-11-26 17:34:44 +00:00
John McLear	77de2d918b	multiline	2014-11-25 22:14:48 +00: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	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	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	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	46bc328896	new api ver	2014-11-08 01:41:23 +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	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
Olivier Tétard	bfde869948	If exportFileName hook isn’t defined don’t return empty filename. ... This commit should fix #2251. If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.	2014-09-28 14:53:07 +02:00
Simon Gaeremynck	2f8b860e69	Added a userLeave hook that gets called when a user leaves a pad	2014-08-08 15:49:15 +01:00
John McLear	17f26b8c2c	Support to allow for a setting so you can stop unknown file types from being imported	2014-07-22 15:46:31 +01:00
Mike DeRosa	25f6c9bf9a	Checking if the author for the sessions match instead of comparing the entire session.	2014-07-12 16:40:59 -04:00
Mike DeRosa	7861cae763	Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready). ... Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.	2014-07-12 16:27:00 -04:00
John McLear	44cb676ba2	Merge pull request #2150 from ether/export-file-name-hook ... Server side hook to modify the export file name	2014-06-16 16:47:15 +01:00
Mike DeRosa	4ccd7131d3	Added function to switch to a different pad without having to reload the whole page.	2014-06-14 14:25:56 -04:00
Marcel Klehr	cd294c608b	Merge pull request #2149 from ether/dont-use-abiword-for-html ... abiword shouldnt be used for HTML native documents	2014-06-11 14:47:33 +02:00