1846 commits

Author	SHA1	Message	Date
John McLear	45e90e138c	v number bump	2015-01-01 16:57:31 +00:00
John McLear	8eb723b906	patch for e1c683be3f	2014-12-31 14:16:10 +00:00
John McLear	036b7d2890	Merge pull request #2418 from ether/etherpad-export-and-import ... Full Pad portability (Export/Import)	2014-12-31 13:32:09 +00:00
John McLear	4b6df17e99	Merge pull request #2421 from webzwo0i/fix-swagger ... hack to avoid warnings in swagger usage	2014-12-31 13:27:00 +00:00
John McLear	b5c671a9b6	Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs ... Clean-up after removing list attribute: Remove list numbering attribute	2014-12-31 13:19:24 +00:00
John McLear	335bf3dc4a	more line polish	2014-12-31 01:46:53 +00:00
John McLear	01c667aa2e	export html more styles	2014-12-31 00:53:20 +00:00
webzwo0i	b0da214ad5	hack to avoid warnings in swagger usage	2014-12-30 18:06:41 +01:00
Marcel Klehr	cfe75c7f3f	Clean-up after removing list attribute: Remove list numbering attribute	2014-12-30 17:45:26 +01:00
Stefan	c20a7e9bce	Merge pull request #2406 from Gared/fix/author-not-set-callback ... Fix missing callback of #2400 and ignore missing author on timeslider on client-side	2014-12-30 14:55:49 +01:00
Stefan	5df638bfac	Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected ... Notify user if cookies can't be created	2014-12-30 14:54:43 +01:00
John McLear	90e83ed6b5	more styling	2014-12-30 14:53:44 +01:00
John McLear	716b1c6113	Merge branch 'develop' of github.com:ether/etherpad-lite into develop	2014-12-30 14:44:55 +01:00
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	19c78212e8	Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished ... Fix lineassembler not finished	2014-12-30 12:19:04 +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	a2262c56b9	msg for user	2014-12-29 22:05:14 +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
webzwo0i	e1c683be3f	differentiate between indents and bullets in unordered lists	2014-12-29 16:12:07 +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	321d550d43	second fix for user list issue on #2413	2014-12-29 01:20:28 +01:00
John McLear	23570e80a7	unbind before rebind, partial fix towards #2413 issue	2014-12-29 01:17:24 +01:00
John McLear	248d7655d7	Merge pull request #2401 from ether/save-prefs ... set prefs and get prefs	2014-12-29 01:01:09 +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	018821e98c	Use camel case	2014-12-28 22:20:09 +01:00
John McLear	74eca43965	Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow ... Close extended chat window	2014-12-28 20:17:30 +01:00
Gared	2307c6fbda	Notify user if cookies can't be created	2014-12-28 15:02:56 +01:00
John McLear	68f50ff9fa	Merge pull request #2409 from ether/fix-removeAttribOnLine ... AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left	2014-12-28 12:52:39 +01:00
Marcel Klehr	362315c638	AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left	2014-12-28 12:34:42 +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
John McLear	c276343216	timeslider fixes	2014-12-27 22:31:23 +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	b1f29b914c	minor ts bg fix	2014-12-27 22:05:35 +01:00