mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
etherpad-lite/src/static/js
History
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
..
pluginfw Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
ace.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
ace2_common.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
ace2_inner.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
AttributePoolFactory.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
broadcast.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
broadcast_revisions.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
broadcast_slider.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
Changeset.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
changesettracker.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
chat.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
collab_client.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
colorutils.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
contentcollector.js Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
cssmanager.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
domline.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
draggable.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
excanvas.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
farbtastic.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
jquery.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
json2.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
linestylefilter.js Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
pad.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
pad_connectionstatus.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
pad_cookie.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
pad_docbar.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
pad_editbar.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
pad_editor.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
pad_impexp.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
pad_modals.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
pad_savedrevs.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
pad_userlist.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
pad_utils.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
prefixfree.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
security.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
skiplist.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
timeslider.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
undo-xpopup.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
undomodule.js First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
virtual_lines.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00