Age | Commit message (Collapse) | Author | |
---|---|---|---|
2012-07-08 | remove unused _opt in favor of code size/readability | Matthias Bartelmeß | |
2012-03-18 | replaceing AttributePoolFactory by AttributePool | Matthias Bartelmeß | |
2012-03-10 | Merge branch 'require-paths' into plugin | Chad Weider | |
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-02 | Merge branch 'pita' | Egil Moeller | |
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-02-26 | First stab at getting client side require(plugin/..) to work from within ↵ | Egil Moeller | |
etherpad | |||
2012-02-26 | The Big Renaming - etherpad is now an NPM module | Egil Moeller | |