10 commits

Author	SHA1	Message	Date
Matthias Bartelmeß	b2173a1084	get rid of node.extend (since duplicated by underscorejs)	2012-04-04 09:40:18 +02:00
Egil Moeller	6120a0b7aa	Merge branch 'develop' of git://github.com/Pita/etherpad-lite	2012-03-27 22:36:48 +02:00
John McLear	beec69ac1c	Merge pull request #556 from fourplusone/feature_jquery ... added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner	2012-03-26 08:10:58 -07:00
Matthias Bartelmeß	208d88cc03	proceed if plugin-definitions.json didn't load properly	2012-03-24 13:29:15 +01:00
Egil Moeller	c591efb352	Plugin list can now be reloaded 'live'	2012-03-19 17:16:49 +01:00
Matthias Bartelmeß	e559df18ce	use underscore.js	2012-03-17 13:38:26 +01:00
Matthias Bartelmeß	692e77b4e5	Merge branch 'feature_jquery' into use_natives ... Conflicts: src/static/js/ace2_inner.js src/static/js/pluginfw/plugins.js	2012-03-16 18:50:32 +01:00
Matthias Bartelmeß	d0dd746c8b	added .keys method to objects, if not supported, fixes IE issue with pluginfw	2012-03-16 18:21:28 +01:00
Matthias Bartelmeß	1cf3ffef4a	added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner	2012-03-14 01:41:05 +01:00
Egil Moeller	73aa0687b8	Client side hooks are now loaded and works	2012-03-01 18:45:02 +01:00