Matthias Bartelmeß
|
1478820d60
|
fixed error foreach error in timeslider.js
|
2012-03-24 19:01:04 +01:00 |
|
Matthias Bartelmeß
|
1789c6e1c5
|
proceed if plugin-definitions.json didn't load properly
|
2012-03-24 18:48:53 +01:00 |
|
Matthias Bartelmeß
|
208d88cc03
|
proceed if plugin-definitions.json didn't load properly
|
2012-03-24 13:29:15 +01:00 |
|
Matthias Bartelmeß
|
349bb595b9
|
corrected underscore path in hooks
|
2012-03-23 20:19:41 +01:00 |
Egil Moeller
|
d0ad90456e
|
Merge commit '1a64a6c1'
|
2012-03-22 18:43:59 +01:00 |
|
Egil Moeller
|
5261ba5a69
|
Forward-ported some bugfixes from olad etherpad
|
2012-03-22 18:34:08 +01:00 |
|
Egil Moeller
|
d21cc1912c
|
Better error message for broken JSON
|
2012-03-21 19:29:59 +01:00 |
|
Egil Moeller
|
1ca12b24e6
|
Bugfixes for plugin installer
|
2012-03-21 19:28:39 +01:00 |
|
Egil Moeller
|
7304a9ef3f
|
Bugfix for misplaced hook call
|
2012-03-21 19:27:43 +01:00 |
|
Egil Moeller
|
c591efb352
|
Plugin list can now be reloaded 'live'
|
2012-03-19 17:16:49 +01:00 |
|
Egil Moeller
|
6fe7f2c2b2
|
Plugin list can now be reloaded 'live'
|
2012-03-19 16:59:57 +01:00 |
|
Matthias Bartelmeß
|
38742401c9
|
newSkipList() -> new SkipList()
|
2012-03-18 11:34:56 +01:00 |
|
Matthias Bartelmeß
|
902837f295
|
renaming AttributePoolFactory
|
2012-03-18 09:06:29 +01:00 |
|
Matthias Bartelmeß
|
8eb43a3ebf
|
replaceing AttributePoolFactory by AttributePool
|
2012-03-18 09:05:46 +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 |
|
Egil Moeller
|
51cae02e9d
|
Show installed plugins and search new ones
|
2012-03-15 18:25:06 +01:00 |
Constantin Jucovschi
|
1a64a6c1c5
|
makes plugin architecture work in client-side from inside IFrames as well
|
2012-03-14 11:45:25 +01:00 |
|
Matthias Bartelmeß
|
e338aeb1a5
|
removing fixEvent which is not used anymore
|
2012-03-14 10:46:03 +01:00 |
|
Matthias Bartelmeß
|
3ef7e82045
|
added map and forEach which were accidentally removed
|
2012-03-14 10:45:02 +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 |
|
Matthias Bartelmeß
|
f34f0585bb
|
smashing errors caused by .forEach
|
2012-03-14 01:28:08 +01:00 |
|
Matthias Bartelmeß
|
b28bfe8e31
|
map / forEach use native impl, if available. ace2_common extends the prototype of Array, if not
|
2012-03-13 21:10:10 +01:00 |
Peter 'Pita' Martischka
|
cccd8a923c
|
Merge git://github.com/Gared/etherpad-lite into develop
|
2012-03-11 16:07:34 -07:00 |
Chad Weider
|
0944670fb7
|
Merge remote-tracking branch 'main/master' into develop
|
2012-03-11 15:58:36 -07:00 |
|
Chad Weider
|
ddda347f7a
|
Merge branch 'require-paths' into plugin
Conflicts:
node/server.js
src/static/js/Changeset.js
src/static/js/ace.js
src/static/js/ace2_common.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/changesettracker.js
src/static/js/chat.js
src/static/js/collab_client.js
src/static/js/contentcollector.js
src/static/js/domline.js
src/static/js/linestylefilter.js
src/static/js/pad.js
src/static/js/pad_connectionstatus.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_editor.js
src/static/js/pad_impexp.js
src/static/js/pad_modals.js
src/static/js/pad_savedrevs.js
src/static/js/pad_userlist.js
src/static/js/pad_utils.js
src/static/js/timeslider.js
src/static/js/undomodule.js
src/static/pad.html
src/static/timeslider.html
|
2012-03-10 15:08:09 -08:00 |
|
Chad Weider
|
1a1f222221
|
Change paths.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
c6b8beabd3
|
Correct paths to reflect their being libraries.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
ca02ca05ae
|
Remove unnecessary line.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
2fd9019792
|
Remove require code that is unnecessary and/or incorrect.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
648603126b
|
Remove require changes in `pushScriptsTo` method.
These duplicate `pushRequireScriptTo` at least, but mostly break things.
|
2012-03-10 14:39:37 -08:00 |
|
Peter 'Pita' Martischka
|
9f03e5ec68
|
Output nicer exceptions in hook call
|
2012-03-04 20:32:57 +01:00 |
|
Egil Moeller
|
ce5d2d8685
|
Merge branch 'pita'
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
|
2012-03-02 22:00:20 +01:00 |
|
Egil Moeller
|
df531a7b2b
|
Made ace actually use the new hooks system, and removed remnants of old system
|
2012-03-01 19:22:02 +01:00 |
|
Egil Moeller
|
81440cd856
|
Removed old pluginfw stuff
|
2012-03-01 19:00:58 +01:00 |
|
Egil Moeller
|
73aa0687b8
|
Client side hooks are now loaded and works
|
2012-03-01 18:45:02 +01:00 |
|
Egil Moeller
|
cf191df0b8
|
So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage...
|
2012-02-28 21:14:31 +01:00 |
|
Egil Moeller
|
b20b86cdc8
|
Partial bugfix
|
2012-02-28 17:52:30 +01:00 |
|
Egil Moeller
|
763361a7c9
|
First stab at getting client side require(plugin/..) to work from within etherpad
|
2012-02-26 17:48:17 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |