Commit graph

19 commits

Author SHA1 Message Date
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
0ip
a743112170 Fix #626, Plugins don't work if pad is on a subdir 2012-04-19 19:44:44 +03:00
Chad Weider
e695c716e5 Work around strange order of execution bug in Firefox. Fixes #620 2012-04-11 02:08:50 -07:00
Egil Moeller
a3c9407ed6 Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-04-05 20:14:48 +02:00
Egil Moeller
8cd1298a16 Added init hook to install plugin database default content and the like 2012-04-05 01:48:12 +02:00
Matthias Bartelmeß
4acbb11fd5 Merge branch 'develop' into feature/implicit_hooks 2012-04-04 15:04:10 +02:00
Matthias Bartelmeß
5115f74f66 use hook name as function name, if not specified
Example `"[hookName]": "ep_plugin/static/js/index:[hookName]"` becomes  `"[hookName]": "ep_plugin/static/js/index"`
2012-04-04 15:03:28 +02:00
Matthias Bartelmeß
5a77979486 make jshint happy 2012-04-04 09:51:46 +02:00
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