346 commits

Author	SHA1	Message	Date
John McLear	b27287ce37	Update src/node/handler/ImportHandler.js	2012-05-23 00:49:12 +02:00
John McLear	c8b93f6ddc	Fix IE import	2012-05-23 00:46:56 +02:00
John McLear	9c6731f3b8	No comet required on landing page	2012-05-22 21:30:50 +02:00
Matthias Bartelmeß	06c36f3023	fix #722 by better argument checking in PadMessageHandler.js	2012-05-22 09:31:28 +02:00
0ip	185a3bface	Add def. bg to <select> and remove useless style	2012-05-20 20:19:16 +03:00
0ip	fe0ea23299	Fix userlist now showing up	2012-05-20 16:02:51 +02:00
0ip	caa56dd32a	Add non-floating popups	2012-05-20 15:59:51 +02:00
0ip	19cf43d0a3	Style select (useful for plugins)	2012-05-20 15:38:12 +02:00
0ip	750b9d44df	Style selected text	2012-05-20 15:37:03 +02:00
0ip	205797cd83	Remove class duplicate	2012-05-20 15:35:41 +02:00
0ip	fbee7dabcf	Add grouped buttons	2012-05-20 15:29:10 +02:00
0ip	afe060e2b8	Remove even more old code	2012-05-20 14:53:30 +02:00
0ip	0d68cd23ba	Remove old CSS code	2012-05-20 14:48:02 +02:00
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
John McLear	ee11338927	Merge pull request #709 from cweider/packaging ... Packaging	2012-05-17 04:59:24 -07:00
Edy	e8639d87ce	fixes issue #707 ... Don't set cached cookies	2012-05-17 12:08:19 +02:00
Egil Moeller	fc946ffc33	Hide editing buttons when in readonly mode	2012-05-17 12:03:38 +02:00
Chad Weider	a9eb2d4e31	Fix ordering of editer code loading operations.	2012-05-14 19:01:00 -07:00
Chad Weider	9b0e2287aa	Add plugin framwork to common package.	2012-05-14 18:20:16 -07:00
Chad Weider	1a2c6425e1	Extract ace2_common into its own package.	2012-05-14 18:20:16 -07:00
Chad Weider	384523859e	Require ace2_common separately.	2012-05-14 18:20:16 -07:00
Chad Weider	97c7842d19	Remove unused line.	2012-05-14 18:20:16 -07:00
Chad Weider	4680bfaee8	Upgrade yajsml version. ... Fixes parent-relative redirects and prints results more nicely.	2012-05-14 18:14:50 -07:00
Chad Weider	d65092e067	Move id, '*link' to the link.	2012-05-14 17:11:05 -07:00
Chad Weider	9942c577dc	Patch tablet styling.	2012-05-13 15:33:22 -07:00
Chad Weider	5d0c853889	Remove unnecessary styles.	2012-05-13 15:33:22 -07:00
Chad Weider	f802a79da6	Make styles less restrictive.	2012-05-13 15:33:22 -07:00
Chad Weider	818c3ef40d	Shift button appearance onto anchor.	2012-05-13 15:33:22 -07:00
Chad Weider	089e0227fd	Shift editbar styles around.	2012-05-13 15:33:22 -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	ab8b2cae21	Remove nonsense styles.	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
John McLear	916e52a1eb	Merge pull request #609 from prauscher/disable-passwords ... Disable passwords	2012-05-13 06:55:47 -07:00
John McLear	c70d88eedc	Merge pull request #667 from fourplusone/feature/cleaner_code ... Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.	2012-05-13 06:51:58 -07:00
0ip	99ecadc0c3	Fix #655, wrong located APIKEY.txt	2012-05-13 00:34:26 +03:00
John McLear	476065b68d	Merge pull request #627 from edy-b/body-block ... add more blocks to pad.html	2012-05-12 14:18:28 -07:00
0ip	c406d076de	Updated socket.io	2012-05-02 19:12:57 +03: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	64db697558	Fixed typos	2012-04-30 16:54:19 +02:00
0ip	7a09d97731	Fix #683 - Disabling authorship colors doesn't work	2012-04-30 17:40:29 +03: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
0ip	96eb8ac004	100% is not needed here http://ragefac.es/416	2012-04-29 21:19:34 +03:00
John McLear	bf568b3477	Merge pull request #682 from fourplusone/fix/fix-677 ... fixed plugins.js	2012-04-29 11:13:45 -07:00
Matthias Bartelmeß	fa622857b9	fixed plugins.js	2012-04-29 20:12:15 +02:00
John McLear	122986798e	Merge pull request #681 from fourplusone/fix/fix-677 ... fixed socket.io in timeslider.js	2012-04-29 11:11:25 -07:00
Matthias Bartelmeß	cbb5a043b8	fixed socket.io in timeslider.js	2012-04-29 20:04:00 +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
John McLear	f6bdbddfcc	Merge pull request #679 from 0ip/highl_mod ... Tidy up wobbly button highlighting code	2012-04-29 08:10:52 -07:00
0ip	2525f20ff4	Tidied up highlighting for currently opened module 2	2012-04-29 02:48:47 +02:00
0ip	4b272fe2e1	Tidied up highlighting for currently opened module	2012-04-29 01:00:31 +02:00
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	e559ef5640	Disable design mode in readonly pad	2012-04-23 16:41:41 +02:00
Egil Moeller	ba3430ebb7	Corect ReadOnly link	2012-04-23 16:20:55 +02:00
Egil Moeller	480d0b8e25	ReadOnly pad handling	2012-04-23 16:18:14 +02:00
Egil Moeller	ed7e254417	Disconnect handling and cleanup of unused code	2012-04-23 14:47:07 +02:00
Egil Moeller	e5a22423bb	Fixed timedelta problem	2012-04-23 14:20:17 +02:00
Egil Moeller	1faae5b756	Timeslider autoupdate on pad change	2012-04-23 13:29:27 +02:00
Egil Moeller	583743a3f9	Restored saved revision support	2012-04-23 12:58:04 +02:00
Egil Moeller	914d79ad20	Unified timeslider and pad editing protocol / component	2012-04-23 12:52:30 +02:00
Matthias Bartelmeß	18d0c81181	adding padutils to padmodals	2012-04-21 14:57:22 +02:00
Matthias Bartelmeß	a557f2414e	cssManager top is not used, so drop it	2012-04-21 13:47:11 +02:00
John McLear	d554420f57	Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing)	2012-04-21 01:23:13 +02:00
John McLear	3798f53f94	Merge pull request #660 from redhog/master ... Unbreak last pull request (I forgot a dependency)	2012-04-20 16:21:04 -07:00
Egil Moeller	d08f3ff5ee	Bugfix dependencies	2012-04-21 01:17:27 +02:00
Matthias Bartelmeß	9d9b7b7b47	Merge branch 'develop' into feature/cleaner_code	2012-04-21 00:34:32 +02:00
John McLear	16edda7d46	luke warm fix.	2012-04-21 00:16:10 +02:00
John McLear	a5210ab27d	Merge pull request #647 from etinquis/fixes ... Fix + New Hook	2012-04-20 15:10:40 -07:00
Matthias Bartelmeß	8fefb551fc	less verbose startup, better log messages at startup	2012-04-20 22:44:10 +02:00
Matthias Bartelmeß	7f50e8f551	server.js can be called from console.	2012-04-20 22:40:33 +02:00
Matthias Bartelmeß	c90ef5aeb8	default dirty.db to current pwd, so no new directory has to be created	2012-04-20 22:39:16 +02:00
Matthias Bartelmeß	e9fc16a974	warn if dirty db is used	2012-04-20 17:03:37 +02:00
Matthias Bartelmeß	90bbf169b2	allow startup without settings file	2012-04-20 17:03:26 +02:00
Matthias Bartelmeß	6fc45d6252	added etherpad-lite to "bin" in package.json	2012-04-20 17:00:32 +02:00
John McLear	b6be00c3ab	Merge pull request #659 from redhog/master ... Oups, forgot a debug print in there in the last pull request	2012-04-20 06:12:34 -07:00
Matthias Bartelmeß	9691f02765	removing Minify.js.rej	2012-04-20 15:12:20 +02:00
Egil Moeller	9a67a3a1db	Removed debug print	2012-04-20 15:08:50 +02:00
John McLear	0a9fcc267f	Merge pull request #658 from redhog/master ... Bugfixes for when plugins are installed as dependencies for other plugins	2012-04-20 05:56:57 -07:00
Egil Moeller	72c972b256	Bugfix for recursive dependency-installation and paths	2012-04-20 14:37:53 +02:00
Matthias Bartelmeß	89ab73c868	removing commented out functions from cssmanager.js	2012-04-20 14:25:07 +02:00
Matthias Bartelmeß	8593b1905c	getRepHTML seems to be unused. Removing	2012-04-20 14:24:44 +02:00
Matthias Bartelmeß	709a3b1dbe	removing debug code in collab_client.js	2012-04-20 13:34:35 +02:00
Matthias Bartelmeß	ab7f7506b9	removed unused functions in collab_client	2012-04-20 13:32:43 +02:00
Matthias Bartelmeß	07ee836946	set view zoom is unused	2012-04-20 12:19:09 +02:00
Matthias Bartelmeß	e661f653b1	sharebox and Feedback are not used. Removing them	2012-04-20 12:15:09 +02:00
Matthias Bartelmeß	23bbe4ab5a	undo-xpopup seems to be unused	2012-04-20 12:04:10 +02:00
Matthias Bartelmeß	f809b0d6c8	removing de-facto noop	2012-04-20 12:03:11 +02:00
0ip	a743112170	Fix #626, Plugins don't work if pad is on a subdir	2012-04-19 19:44:44 +03:00
John McLear	4a7ab12859	Merge pull request #649 from rassie/patch-1 ... Corrected color picker: `jQuery(...).css('background-color')` returns…	2012-04-19 08:37:09 -07: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