John McLear
|
9b66c93d6b
|
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
|
2014-11-22 19:11:35 +00:00 |
|
Stefan
|
bb21759d78
|
Fix timeslider revision not changing in most cases
|
2014-08-09 18:52:44 +02:00 |
|
webzwo0i
|
8175af3017
|
[collab_client] remove socketid because its not used
|
2013-12-08 17:20:53 +01:00 |
|
John McLear
|
ac448937ab
|
fix egils fix of time delta resolves #1345
|
2013-01-10 00:01:38 +00:00 |
|
Marcel Klehr
|
f68adc8553
|
Fix translations in timeslider code
|
2012-12-23 18:17:05 +01:00 |
|
Simon Leblanc
|
94e9cf0a32
|
improving the translation of the timeline
|
2012-11-23 06:20:09 +01:00 |
|
Egil Moeller
|
ed7e254417
|
Disconnect handling and cleanup of unused code
|
2012-04-23 14:47:07 +02:00 |
|
Egil Moeller
|
e5a22423bb
|
Fixed timedelta problem
|
2012-04-23 14:20:17 +02:00 |
|
Egil Moeller
|
1faae5b756
|
Timeslider autoupdate on pad change
|
2012-04-23 13:29:27 +02:00 |
|
Egil Moeller
|
914d79ad20
|
Unified timeslider and pad editing protocol / component
|
2012-04-23 12:52:30 +02:00 |
|
Matthias Bartelmeß
|
daca484747
|
Merge branch 'develop' into objectify_ep
Conflicts:
src/node/utils/tar.json
src/static/js/ace2_inner.js
|
2012-03-27 11:15:48 +02:00 |
|
Matthias Bartelmeß
|
8eb43a3ebf
|
replaceing AttributePoolFactory by AttributePool
|
2012-03-18 09:05:46 +01:00 |
|
Matthias Bartelmeß
|
e559df18ce
|
use underscore.js
|
2012-03-17 13:38:26 +01:00 |
|
Matthias Bartelmeß
|
b28bfe8e31
|
map / forEach use native impl, if available. ace2_common extends the prototype of Array, if not
|
2012-03-13 21:10:10 +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 |
|
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 |
|