Chad Weider
|
3312387b08
|
Drop embedding of modules.
With loopback removed, embedding concatenated resources doesn't happen. It
was a marginal feature to begin with so it will not be missed.
|
2012-09-09 14:40:20 -07:00 |
|
Chad Weider
|
6e796eb5fb
|
Make exception case for require kernel obvious.
|
2012-09-03 14:41:26 -07:00 |
|
Egil Moeller
|
357ca73a99
|
Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication.
|
2012-05-30 10:00:36 +02:00 |
|
Chad Weider
|
819fb76dcd
|
These definitions are meaningless.
|
2012-05-28 16:43:20 -07:00 |
|
Chad Weider
|
96ab3dc3b4
|
jQuery is packaged - this is pure duplication.
|
2012-05-28 15:14:52 -07:00 |
|
Chad Weider
|
c4c30bf725
|
Correct parent_require path.
|
2012-05-28 15:14:51 -07:00 |
|
Chad Weider
|
299a90b3ba
|
Fix paths for ace files.
|
2012-05-28 15:14:51 -07:00 |
|
Chad Weider
|
a9eb2d4e31
|
Fix ordering of editer code loading operations.
|
2012-05-14 19:01:00 -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 |
|
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 |
|
Matthias Bartelmeß
|
f809b0d6c8
|
removing de-facto noop
|
2012-04-20 12:03:11 +02:00 |
|
Martyn York
|
da75b87d3c
|
added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe.
|
2012-04-18 14:44:25 -07:00 |
|
Matthias Bartelmeß
|
c79593569a
|
added aceEditorCSS hook
|
2012-04-07 01:40:13 +02:00 |
|
Egil Moeller
|
6120a0b7aa
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
|
2012-03-27 22:36:48 +02:00 |
|
Egil Moeller
|
668725b892
|
Add jquery to ace iframe
|
2012-03-27 22:24:36 +02:00 |
|
Egil Moeller
|
d0ad90456e
|
Merge commit '1a64a6c1'
|
2012-03-22 18:43:59 +01:00 |
|
Egil Moeller
|
7304a9ef3f
|
Bugfix for misplaced hook call
|
2012-03-21 19:27:43 +01:00 |
|
Matthias Bartelmeß
|
e559df18ce
|
use underscore.js
|
2012-03-17 13:38:26 +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 |
|
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 |
|
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
|
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 |
|