etherpad-lite - Really real-time collaborative document editing. http://etherpad.org

Age	Commit message (Collapse)	Author
2012-03-11	Merge git://github.com/Gared/etherpad-lite into develop	Peter 'Pita' Martischka

2012-03-11	Merge remote-tracking branch 'main/master' into develop	Chad Weider

2012-03-10	Correct indentation.	Chad Weider

2012-03-10	These definitions have no need to be inside this closure.	Chad Weider

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-10	Change paths.	Chad Weider

2012-03-10	Correct paths to reflect their being libraries.	Chad Weider

2012-03-10	Remove unnecessary line.	Chad Weider

2012-03-10	Remove require code that is unnecessary and/or incorrect.	Chad Weider

2012-03-10	Remove require changes in `pushScriptsTo` method.	Chad Weider
	These duplicate `pushRequireScriptTo` at least, but mostly break things.
2012-03-04	Output nicer exceptions in hook call	Peter 'Pita' Martischka

2012-03-04	Fix gitignore for custom files	Peter 'Pita' Martischka

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-03-01	Fixed timeslider which I broke a few minutes ago	Egil Moeller

2012-03-01	Made ace actually use the new hooks system, and removed remnants of old system	Egil Moeller

2012-03-01	Removed old pluginfw stuff	Egil Moeller

2012-03-01	Client side hooks are now loaded and works	Egil Moeller

2012-02-28	So simple, yet so hard to find. Finally I found you, oh error caused by the ↵	Egil Moeller
	new require usage...
2012-02-28	Partial bugfix	Egil Moeller

2012-02-26	Merge branch 'temo'	Egil Moeller

2012-02-26	Minify now supports plugins	Egil Moeller

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