821 commits

Author	SHA1	Message	Date
Gared	2307c6fbda	Notify user if cookies can't be created	2014-12-28 15:02:56 +01:00
John McLear	ae22332f71	removing dokuwiki	2014-12-27 14:08:45 +01: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
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
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	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	5f2e830b72	whoopsi	2014-11-22 19:13:23 +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	488d6890f9	minor styling	2014-11-21 00:15:55 +00:00
John McLear	ff9a2a687f	whoops fix animation not to look broken	2014-11-19 18:27:55 +00:00
John McLear	28c7b666c1	correct file links	2014-11-19 00:24:14 +00:00
John McLear	16d8068d7d	Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons	2014-11-19 00:17:01 +00:00
John McLear	9aea689438	move tiny bit of font awesome we actually use into pad.css	2014-11-19 00:16:08 +00:00
John McLear	f5dcc374ba	slight ui fix	2014-11-18 23:15:56 +00:00
John McLear	e821cb13fa	more polish	2014-11-18 22:47:20 +00:00
John McLear	95cb721914	clean up	2014-11-18 22:41:00 +00:00
John McLear	09b08e5a72	working pause	2014-11-18 22:29:46 +00:00
John McLear	e2410e41b0	more polish	2014-11-18 22:24:16 +00:00
John McLear	a06f01c04a	some timeslider styling but this wont be completed by me	2014-11-18 22:21:36 +00:00
Beau Gunderson	645ec830b0	Don't crash on bad plugins.json; fixes #2323	2014-11-18 13:59:36 -08:00
John McLear	4a12eec3e0	a font lookup file	2014-11-18 21:10:40 +00:00
John McLear	9712f852e9	remove connecting bar image	2014-11-18 19:16:50 +00:00
John McLear	9b5ee93bce	spinning loading icons	2014-11-18 19:13:51 +00:00