cohitre
|
52aa7d3997
|
Registering commands on the ace toolbar
|
2013-03-10 15:42:12 -07:00 |
|
cohitre
|
292a3bd7b7
|
Setting up the right toolbar.
|
2013-03-09 14:57:42 -08:00 |
|
Marcel Klehr
|
0c9178d392
|
Fix html10n usage in code that wouldn't allow lang switching
|
2012-12-23 18:17:19 +01:00 |
|
Iván Eixarch
|
9f1872afc1
|
use properties notation
|
2012-12-09 08:56:58 +01:00 |
|
Iván Eixarch
|
b01903202c
|
Added new strings to translate for js files
|
2012-12-07 05:24:40 +01:00 |
|
John McLear
|
56453409a5
|
Update src/static/js/pad_editbar.js
Somehow </iframe> was no more. Now it is back.. Oh boy.
|
2012-10-02 02:19:44 +02:00 |
|
Marcel Klehr
|
6bda1f8e4d
|
Fix padeditbar.toggleDropDown
Only call callback, if one was passed.
|
2012-07-13 09:13:22 +02:00 |
|
Marcel Klehr
|
9e9cbd5ffa
|
Fix typo.
|
2012-07-13 08:24:02 +02:00 |
|
Marcel Klehr
|
6da6a7f0d8
|
Use nice editbar popups for connection status instead of srceen-blocking modals.
|
2012-07-13 08:23:22 +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 |
|
Chad Weider
|
dc0fb12b09
|
Remove onclick attributes from editbar.
|
2012-05-13 15:33:22 -07:00 |
|
0ip
|
23cdb2a5c6
|
Removed QR-Code
|
2012-04-30 15:54:21 +02:00 |
|
0ip
|
4b272fe2e1
|
Tidied up highlighting for currently opened module
|
2012-04-29 01:00:31 +02:00 |
|
Egil Moeller
|
c173ebe197
|
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
|
2012-04-25 17:51:03 +02:00 |
|
Egil Moeller
|
ba3430ebb7
|
Corect ReadOnly link
|
2012-04-23 16:20:55 +02:00 |
|
0ip
|
d75aeeaf8f
|
pad_editbar adapated hacky highlighting of currently opened module to recent changes
|
2012-04-16 15:23:19 +02:00 |
|
0ip
|
ae21eb30dd
|
Deselect highlighted editbar module button when userlist is opened
|
2012-04-06 22:32:19 +03:00 |
|
Egil Moeller
|
33c53e61c2
|
Merge branch 'johnyma22'
Conflicts:
node/utils/Minify.js
src/static/js/pad.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_savedrevs.js
static/css/timeslider.css
static/pad.html
|
2012-04-01 13:27:38 +02: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
|
b20b86cdc8
|
Partial bugfix
|
2012-02-28 17:52:30 +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 |
|