27 commits

Author	SHA1	Message	Date
John McLear	fbc2cb32b3	Merge pull request #705 from johnyma22/removeWordle ... Remove wordle	2012-05-19 05:58:38 -07:00
John McLear	53bfc380af	Merge pull request #703 from cweider/remove-onclick ... Remove onclick	2012-05-19 05:41:49 -07:00
Egil Moeller	9f46678e5d	Bugfix for IE and document.domain	2012-05-18 18:57:18 +02:00
Chad Weider	d65092e067	Move id, '*link' to the link.	2012-05-14 17:11:05 -07:00
Chad Weider	1ea889bfab	Anchors are not icons	2012-05-13 15:33:22 -07:00
Chad Weider	2a3fce0cf1	The showusers control is an anchor.	2012-05-13 15:33:22 -07:00
Chad Weider	dc0fb12b09	Remove onclick attributes from editbar.	2012-05-13 15:33:22 -07:00
John McLear	def904dbed	remove wordle	2012-05-13 20:20:18 +01:00
Edy	47a257ff72	accidentally deleted an end block in last merge	2012-05-01 12:02:12 +02:00
Edy	1329e93639	Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block ... Conflicts: src/templates/pad.html	2012-05-01 11:35:06 +02:00
0ip	23cdb2a5c6	Removed QR-Code	2012-04-30 15:54:21 +02:00
Edy	cf54c23228	Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block ... Resolved conflicts: src/templates/pad.html	2012-04-30 15:17:23 +02:00
John McLear	a73192b10d	Merge pull request #680 from fourplusone/fix/fix-677 ... Fix #677	2012-04-29 10:57:35 -07:00
Matthias Bartelmeß	0e941b498e	fix #677	2012-04-29 19:54:38 +02:00
0ip	4b272fe2e1	Tidied up highlighting for currently opened module	2012-04-29 01:00:31 +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
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
Chad Weider	b767192c58	Revert "Made it possible to disable minification again" ... This reverts commit 22eaa6ffc0.	2012-04-11 02:08:50 -07: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	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	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

Renamed from src/static/pad.html (Browse further)