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 |
|
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
|
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 |
|