846 commits

Author	SHA1	Message	Date
John McLear	3773b6346b	semi working requires browser refresh	2014-12-29 20:57:58 +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	6b1fee400d	Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest	2014-12-29 00:40:07 +01:00
John McLear	74eca43965	Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow ... Close extended chat window	2014-12-28 20:17:30 +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
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
John McLear	b1f29b914c	minor ts bg fix	2014-12-27 22:05:35 +01:00
John McLear	036df30c0e	Merge pull request #2402 from ether/fix-attribmanager-removeLineAttrib ... Fix removeAttributeOnLine: Only remove a single attrib	2014-12-27 19:23:49 +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
webzwo0i	07a6702363	Revert "be more strict in checkRep" ... This reverts commit 22803da42f.	2014-12-27 17:56:20 +01:00
Marcel Klehr	a63880dcb1	Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib	2014-12-27 16:15:20 +01:00
John McLear	a151c207c2	set prefs and get prefs	2014-12-27 15:08:54 +01:00
John McLear	ae22332f71	removing dokuwiki	2014-12-27 14:08:45 +01:00
John McLear	9d66a446dc	support indentation up to 16 levels and dont go back afterwards	2014-12-27 13:18:58 +01:00
John McLear	10d92b6bf1	slightly better attribute selection logic but still pretty b0rked	2014-12-26 23:42:00 +00:00
John McLear	88ab74b1e9	fix flowing of items in editbar	2014-12-24 17:54:13 +00:00
John McLear	b71fb3ad20	fix issue with attributes	2014-12-23 02:38:50 +00:00
John McLear	3fe58068c0	more fixes	2014-12-21 23:16:00 +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
John McLear	745ef5db1c	fix timeslider socket issue	2014-12-21 23:10:56 +00:00
John McLear	a2d22a5764	Merge pull request #2377 from webzwo0i/avoid-global-vairables ... declare var outside of loop	2014-12-16 16:18:01 +00:00
webzwo0i	0263d30b37	declare var outside of loop	2014-12-16 17:00:35 +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	a2dbf8761f	allow for timeslider custom messages	2014-12-10 01:23:24 +00:00
Simon Gaeremynck	45c1ad078b	Allow for shardable Etherpad	2014-12-09 14:59:18 +00:00
John McLear	653cc6c87f	this class was in before, it is used to show when a style is applied to a piece of content	2014-12-09 14:57:18 +00:00
John McLear	f11bdc1b44	also logic to add attributes for properties	2014-12-09 01:31:40 +00:00
John McLear	6080de9d79	Merge pull request #2348 from ether/sanitizer ... sanitizer change	2014-12-04 17:31:42 +00:00
webzwo0i	22803da42f	be more strict in checkRep	2014-12-04 16:12:13 +01:00
webzwo0i	10c2f72720	dont remove more lines than exist in the whole text	2014-12-04 16:01:39 +01:00
John McLear	c1fdd7ff79	Merge branch 'develop' of github.com:ether/etherpad-lite into develop	2014-12-01 15:10:17 +00:00
John McLear	c539cc7d6b	styling of global view colum	2014-12-01 15:10:03 +00:00
John McLear	d7e980cd47	yet more minor css polish	2014-11-29 02:24:19 +00:00
John McLear	ed96c13a1f	minor ui polish	2014-11-29 00:54:06 +00:00
John McLear	ee585f0457	color picker on mobile actually shows on screen	2014-11-29 00:32:37 +00:00
John McLear	34f7625739	a little more polish	2014-11-29 00:30:13 +00:00
John McLear	53887db872	mobile ui polish	2014-11-29 00:26:25 +00:00
John McLear	a642deaa72	gritter css fix	2014-11-28 02:25:21 +00:00
John McLear	68979e1212	better fix	2014-11-28 00:35:46 +00:00
John McLear	e6d85bbe69	fix issue with top of chatbox not being aligned properly	2014-11-28 00:26:34 +00:00
John McLear	d974e881a8	Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer	2014-11-28 00:02:16 +00:00
John McLear	3ca48ed975	fix undo in chrome etc	2014-11-27 16:49:08 +00:00
John McLear	2c728b8e1b	sanitizer change	2014-11-27 00:45:22 +00:00
John McLear	e51ab2db24	fix for #2132	2014-11-26 23:37:44 +00:00
John McLear	60d44cd3df	use cheerio instead of jsdom	2014-11-25 17:26:09 +00:00