John McLear
ba8177fc6f
Merge pull request #999 from lepidum/develop
...
Fixed international composition issues (e.g., Japanese Input method)
2012-09-14 04:50:08 -07:00
NAGOYA, Yoshihiko
71c9444694
fix for InternationalComposition(e.g., Japanese Input)
...
moved inInternationalComposition from Ace2Inner to top window
fix bindTheEventHandlers() because ie9 implement CompositionEvent
when inInternationalComposition, NEW_CHANGES msg and ACCEPT_COMMIT msg
are pushed msgQueue.
when handleUserChanges(), apply msgQueue.
2012-09-13 23:37:26 +09:00
Wikinaut
85f5eb38e4
fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled
2012-08-16 01:00:36 +02:00
Marcel Klehr
9aed433ad5
Fix #880 Remove call to padsavedrevs.handleIsFullyConnected
2012-07-18 15:54:53 +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
53bfc380af
Merge pull request #703 from cweider/remove-onclick
...
Remove onclick
2012-05-19 05:41:49 -07:00
Egil Moeller
fc946ffc33
Hide editing buttons when in readonly mode
2012-05-17 12:03:38 +02:00
Chad Weider
dc0fb12b09
Remove onclick attributes from editbar.
2012-05-13 15:33:22 -07: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
0ip
23cdb2a5c6
Removed QR-Code
2012-04-30 15:54:21 +02:00
Matthias Bartelmeß
0e941b498e
fix #677
2012-04-29 19:54:38 +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
e559ef5640
Disable design mode in readonly pad
2012-04-23 16:41:41 +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ß
38276e636c
postAceInit passes ace instance
2012-04-07 01:06:29 +02:00
Egil Moeller
434252a321
Removed prefixfree as it breaks @import in css files
2012-04-01 22:55:04 +02: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
Egil Moeller
c65216a09f
Added client side hook postAceInit
2012-03-27 22:23:55 +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
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
