1054 commits

Author	SHA1	Message	Date
John McLear	16713d8b3b	some demo export loic for handling OL incrementation	2014-12-30 14:43:00 +01:00
John McLear	4687d226c6	Merge pull request #2417 from webzwo0i/fix-export ... Fix ExportHtml.js list parsing code	2014-12-30 13:47:31 +01:00
John McLear	a07d1722fc	no errors on chrome client	2014-12-30 12:12:24 +01:00
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	0676d2fe24	working author import	2014-12-30 00:01:15 +01:00
John McLear	b8648b4a49	remove error logging	2014-12-29 23:08:42 +01:00
John McLear	1e0de620be	more author logic	2014-12-29 23:08:17 +01:00
John McLear	ec2b844f94	authors	2014-12-29 22:51:31 +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	1081156f13	whoopsi, required files	2014-12-29 21:13:49 +01:00
John McLear	3773b6346b	semi working requires browser refresh	2014-12-29 20:57:58 +01:00
webzwo0i	6e4e034e42	fix closing of lists	2014-12-29 16:27:40 +01:00
John McLear	302ceb665b	delay write to fix copypad -- bad practice but due to db.set not allowing callback	2014-12-29 14:59:22 +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
webzwo0i	6ca2c91fdf	close and open lists according to the actual line.listLevel	2014-12-28 02:32:53 +01:00
webzwo0i	d71b11f4b2	fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested	2014-12-28 02:31:26 +01:00
John McLear	dd09f6144b	Merge pull request #2398 from ether/indentLevels ... Indent levels	2014-12-27 23:27:11 +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
John McLear	6ac99ab03f	support for export	2014-12-27 13:27:07 +01:00
John McLear	fdc930de3d	Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles	2014-12-21 23:43:21 +00:00
John McLear	ee3f3b8060	move clean css back to fix minification on TS	2014-12-21 23:42:56 +00:00
John McLear	12aac2d0d0	Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles	2014-12-21 23:12:59 +00:00
webzwo0i	69bad8b30c	fix typo in addSavedRevisions	2014-12-17 01:10:20 +01:00
webzwo0i	b204aa2085	remove more dead requires.	2014-12-16 19:10:01 +01:00
John McLear	cfa3f15f94	Merge pull request #2373 from webzwo0i/avoid-global-vairables ... dont make local variables global	2014-12-16 00:41:41 +00:00
webzwo0i	5d15f655f0	dont make local variables global	2014-12-14 22:01:28 +01:00
John McLear	197a41627d	allow plugins to add multiple styles	2014-12-09 17:34:52 +00:00
John McLear	3a2669b704	additional tag support hook	2014-12-09 16:13:52 +00:00
John McLear	f2c155ee1a	blah use async	2014-12-08 19:44:40 +00:00
John McLear	7cf0e4a9ae	allow padId to be passed into the hook	2014-12-08 19:11:45 +00:00
John McLear	2218cbd252	docs	2014-12-08 19:08:12 +00: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	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