185 commits

Author	SHA1	Message	Date
0ip	c11df112e8	templates/plugins.html Fixed relative paths	2012-04-28 22:00:15 +02:00
Egil Moeller	c173ebe197	Merge branch 'master' into timeslider-realtimeupdate+readonly-pads	2012-04-25 17:51:03 +02:00
Matthias Bartelmeß	513deef768	added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670	2012-04-25 10:23:58 +02:00
Egil Moeller	ed7e254417	Disconnect handling and cleanup of unused code	2012-04-23 14:47:07 +02:00
John McLear	9fe8a7530d	Merge pull request #641 from 0ip/highlight_module ... Fix | Highlight currently opened module	2012-04-19 08:23:51 -07:00
0ip	31909f6e60	Added viewport	2012-04-19 17:04:44 +02:00
0ip	ef88d2798e	Restore overwritten plugin manager UI	2012-04-19 17:00:29 +02:00
Egil Moeller	7ab7ee9f5e	Plugin admin fixes	2012-04-17 22:40:53 +02:00
Egil Moeller	6f774bc6a5	Separated out the code for the plugin manager	2012-04-17 22:40:46 +02:00
Egil Moeller	f80f9fc59f	Merge commit 'd5120c9' into pita	2012-04-17 22:34:45 +02:00
0ip	3e47300587	template/pad.html removed id duplicates, moved revision button, converted TABS to spaces	2012-04-16 15:19:53 +02:00
0ip	9cbb897c45	template/pad.html removed some whitespace	2012-04-16 15:13:07 +02:00
Edy	f4be70c45e	add more blocks to pad.html ... ... to allow plugins to be more flexible extending etherpad	2012-04-12 20:24:38 +02:00
0ip	8fa54e2402	admin interface styling and sensibility	2012-04-11 19:44:18 +02:00
Chad Weider	b767192c58	Revert "Made it possible to disable minification again" ... This reverts commit 22eaa6ffc0.	2012-04-11 02:08:50 -07:00
John McLear	7766f8aaad	Merge pull request #591 from fourplusone/timeslider_authors ... Timeslider authors	2012-04-05 16:38:55 -07:00
Matthias Bartelmeß	151f1a0d71	Merge branch 'develop' into timeslider_authors	2012-04-05 21:54:26 +02:00
Matthias Bartelmeß	9e042ee942	Merge branch 'develop' into timeslider_authors ... Conflicts: src/static/css/pad.css src/templates/timeslider.html	2012-04-05 21:47:59 +02:00
Egil Moeller	a3c9407ed6	Merge branch 'develop' of git://github.com/Pita/etherpad-lite	2012-04-05 20:14:48 +02:00
johnyma22	d5120c98d0	very quick admin interface styling and sensibility	2012-04-05 18:22:53 +01:00
johnyma22	66fdacf9cf	move css out of html	2012-04-05 18:04:17 +01:00
johnyma22	28aeb24f86	add some sense to the buttons on the plugin page	2012-04-05 18:00:38 +01:00
Egil Moeller	4325f0b907	Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff	2012-04-05 01:45:14 +02:00
Egil Moeller	08cc3e128f	Bugfix for timeslider styling	2012-04-01 14:33:39 +02:00
Egil Moeller	33c53e61c2	Merge branch 'johnyma22' ... Conflicts: node/utils/Minify.js src/static/js/pad.js src/static/js/pad_docbar.js src/static/js/pad_editbar.js src/static/js/pad_savedrevs.js static/css/timeslider.css static/pad.html	2012-04-01 13:27:38 +02:00
Egil Moeller	b74447aa3c	Styling generalization - use classes instead of id:s where applicable	2012-03-28 19:20:07 +02:00
Egil Moeller	22eaa6ffc0	Made it possible to disable minification again	2012-03-22 18:35:06 +01:00
Egil Moeller	50474dff1f	Some new blocks to allow plugins to add scripts, styles and modals	2012-03-21 19:29:06 +01:00
Egil Moeller	1ca12b24e6	Bugfixes for plugin installer	2012-03-21 19:28:39 +01:00
Egil Moeller	c591efb352	Plugin list can now be reloaded 'live'	2012-03-19 17:16:49 +01:00
Egil Moeller	af96509fbb	Plugin install/uninstall	2012-03-17 18:17:10 +01:00
Egil Moeller	81250cba15	Searching for plugins, plus handling async events from the server (progress)	2012-03-15 21:07:48 +01:00
Egil Moeller	51cae02e9d	Show installed plugins and search new ones	2012-03-15 18:25:06 +01:00
Egil Moeller	a5366a0a16	Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu	2012-03-13 20:32:56 +01:00
Egil Moeller	05c2e0fde5	Made all html pages into eejs templates	2012-03-13 18:24:45 +01:00