Marcel Klehr
|
6054cda473
|
Create a customizable timeslider toolbar
|
2014-03-30 13:02:41 +02:00 |
|
webzwo0i
|
906ab1820b
|
[timeslider] do not include underscore, as its not (longer) used
|
2013-12-08 17:31:18 +01:00 |
|
John McLear
|
8836981e32
|
expose broadcast slider so plugins can interact with it
|
2013-04-09 15:55:14 +01:00 |
|
mluto
|
1793e93ea1
|
Decode the sessionID before sending it to the server since our separator ',' gets encoded
|
2013-03-31 11:30:01 +02:00 |
|
John McLear
|
f915285f15
|
merge develop
|
2013-02-25 10:13:50 +00:00 |
|
John McLear
|
9eff8576ef
|
timeslider init hook
|
2013-02-18 22:04:58 +00:00 |
|
John McLear
|
cda3a0e78b
|
a different approach
|
2013-02-18 21:03:52 +00:00 |
|
John McLear
|
7fcc71710f
|
dont exposrt sendSocketMs
|
2013-02-18 18:59:53 +00:00 |
|
John McLear
|
75fd27998e
|
expose socket timeslider with a bad hack
|
2013-02-18 18:58:58 +00:00 |
|
johnyma22
|
d929877865
|
JS fix for #1077 fire event at start because of the resize issue, this is a clean way of doing it
|
2012-10-30 22:35:01 +00:00 |
|
Marcel Klehr
|
6c89187f95
|
Fix #1067 Corrected exports links regexp
|
2012-10-16 20:46:27 +02:00 |
|
Egil Moeller
|
15a7d24450
|
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
Conflicts:
src/node/handler/PadMessageHandler.js
src/static/css/pad.css
src/templates/pad.html
|
2012-05-29 21:26:12 +02:00 |
|
John McLear
|
c70d88eedc
|
Merge pull request #667 from fourplusone/feature/cleaner_code
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
|
2012-05-13 06:51:58 -07:00 |
|
Matthias Bartelmeß
|
cbb5a043b8
|
fixed socket.io in timeslider.js
|
2012-04-29 20:04:00 +02:00 |
|
Egil Moeller
|
c173ebe197
|
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
|
2012-04-25 17:51:03 +02:00 |
|
Matthias Bartelmeß
|
513deef768
|
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
|
2012-04-25 10:23:58 +02:00 |
|
Egil Moeller
|
ed7e254417
|
Disconnect handling and cleanup of unused code
|
2012-04-23 14:47:07 +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ß
|
23bbe4ab5a
|
undo-xpopup seems to be unused
|
2012-04-20 12:04:10 +02:00 |
|
Matthias Bartelmeß
|
1478820d60
|
fixed error foreach error in timeslider.js
|
2012-03-24 19:01:04 +01:00 |
|
Matthias Bartelmeß
|
e559df18ce
|
use underscore.js
|
2012-03-17 13:38:26 +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
|
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 |
|