lepidum
596f0bbb4e
Merge pull request #1 from ayokura/prevent-esc
...
Prevent to press ESC key
2012-08-30 02:06:33 -07:00
NAGOYA, Yoshihiko
55cf1cabb5
fix prevent ESC key patch
2012-08-30 13:24:35 +09:00
NAGOYA, Yoshihiko
521e76ae44
prevent ESC key
2012-08-30 12:00:27 +09:00
John McLear
294029643a
Merge pull request #961 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues-rebased-onto-master
...
Fix ie8 native xmlhttp support disabled issues rebased onto master
2012-08-27 12:40:56 -07:00
Wikinaut
1e092e3ed4
use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues
2012-08-27 00:39:56 +02:00
Wikinaut
aa1d2ba1a1
fix issue #955 : upd resolve library to 0.2.3
2012-08-27 00:39:56 +02:00
Wikinaut
4cf5f2b12c
fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled
2012-08-27 00:37:50 +02:00
John McLear
7f9edd1df1
Merge pull request #957 from MarkTraceur/hook/http/padUsers
...
Add in padUsers HTTP API call
2012-08-22 13:13:27 -07:00
Wikinaut
67088e5b7f
upd version resolve
2012-08-18 01:03:18 +02:00
Wikinaut
e82588c332
use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues
2012-08-18 00:47:13 +02:00
Mark Holmquist
f9469ef256
Add in padUsers HTTP API call
...
I needed the list of users this time, so I got it. There are docs
and everything.
2012-08-17 13:39:16 -07:00
Wikinaut
da30c8983a
fix issue #955 : upd resolve library to 0.2.3
2012-08-17 00:45:02 +02:00
John McLear
9b1673c60f
Merge pull request #942 from Pita/docs
...
Docs
2012-08-16 09:23:09 -07:00
John McLear
59d27226d5
Merge pull request #946 from marcelklehr/doc/server-hook-loadSettings
...
Documentation for 'loadSettings' hook.
2012-08-16 09:22:41 -07: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
1bb8844f42
Document loadSettings hook.
2012-08-15 10:10:55 +02:00
John McLear
9957e33f21
Merge pull request #950 from MarkTraceur/docs
...
Fix doc format, add in makefile for docs
2012-08-14 07:37:43 -07:00
Mark Holmquist
17375b2eed
Fix doc format, add in makefile for docs
...
OK, first up, SOMEBODY *cough*analphabet*cough* screwed up the docs
by making them all use the wrong heading level. Not cool, guy. I
had to change them so they would compile right.
But anyway, now the docs will build into sexy-looking HTML and will
shortly be hosted on marktraceur.info.
Fixed the makefile to work properly.
Run:
* `make clean` for removing old doc-build(s)
* `make docs` for running new doc-build(s)
2012-08-13 21:11:39 -07:00
John McLear
6a3457dbd7
Merge pull request #949 from unindented/develop
...
Normalize inserted text using UNorm - Good job and thanks :)
2012-08-13 09:45:24 -07:00
Daniel Perez Alvarez
f29d08c103
Merge branch 'feature/unicode-normalization' into develop
2012-08-13 17:12:11 +01:00
Daniel Perez Alvarez
699aa299f8
Normalize inserted text using UNorm
...
For some reason, the client was sending the server a Unicode-normalized
version of inserted strings. So if for example we inserted the string
'ä' (i.e. \x61\xCC\x88) into the document, what would be sent to the
server would be 'ä' (i.e. \xC3\xA4).
This wouldn't be a problem on its own. BUT JavaScript reports that the
length of the first string is 2, while the length of the second one is
1.
So the command that was being sent to the server was 'Z:1>2*0+1$ä', when
it should really be 'Z:1>1*0+1$ä'. When the `checkRep` method checks the
length of the inserted string, it finds an inconsistency, and
disconnects the client.
We now normalize the inserted string before the command is generated, so
the length is always correct.
2012-08-13 17:09:02 +01:00
Daniel Perez Alvarez
48f1545777
Add Unicode normalization library
2012-08-13 17:06:25 +01:00
John McLear
a4603a3bb6
Merge pull request #945 from marcelklehr/doc/client-hook-documentReady
...
Document 'documentReady' client hook.
2012-08-12 12:42:38 -07:00
Marcel Klehr
98cdb96ac3
Document 'documentReady' client hook.
2012-08-12 21:29:21 +02:00
John McLear
71d6d520e8
Merge pull request #939 from marcelklehr/fix/group2sessions-bug
...
Create group2sessions.sessionIDs if it doesn't exist yet.
2012-08-12 09:10:29 -07:00
John McLear
ec130e91c0
Merge pull request #914 from marcelklehr/feature/simplify-windows-install
...
Simplify windows install
2012-08-12 09:10:01 -07:00
John McLear
838834f438
Merge pull request #930 from MarkTraceur/new-doc/http/send-clients-message
...
Added in docs for the HTTP call I just added
2012-08-12 09:09:20 -07:00
John McLear
aabdf665a7
Merge pull request #934 from MarkTraceur/new-doc/plugin/handle-client-message
...
Add in docs for the new hook I just added
2012-08-12 08:55:44 -07:00
John McLear
a5f6815e65
Merge pull request #899 from marcelklehr/fix/show-onload-errors
...
Display errors occuring on page load to the user.
2012-08-12 08:55:24 -07:00
John McLear
14c874b80e
Merge pull request #903 from marcelklehr/feature/hook-loadSettings2
...
[API hook] loadSettings
2012-08-12 08:54:31 -07:00
John McLear
85191ca798
Merge pull request #905 from marcelklehr/feature/hook-documentReady
...
Add a documentReady client hook
2012-08-12 08:54:03 -07:00
John McLear
132278a9d6
Merge pull request #928 from marcelklehr/fix/update-socket-io
...
Update socket.io
2012-08-12 08:53:18 -07:00
John McLear
ba6acd822e
Merge pull request #929 from MarkTraceur/hook/http/send-clients-message
...
Add in an HTTP API call to send a custom message type.
2012-08-12 08:53:07 -07:00
John McLear
1eb63535ca
Merge pull request #931 from MarkTraceur/hook/plugin/handleClientMessage
...
Add in a plugin hook "handleClientMessage_<MSG_NAME>"
2012-08-12 08:52:53 -07:00
John McLear
a42b2440ba
Merge pull request #943 from gedion/develop
...
Add a hook for utils/ExportHtml.js
2012-08-12 08:48:10 -07:00
Gedion
e9b22e8ac3
fix indentation
2012-08-11 15:44:42 -05:00
gedion
4d11e49878
Update src/node/utils/ExportHtml.js
...
Added a hook for utils/ExportHtml.js
2012-08-11 13:08:28 -05:00
Gedion
df7d7769c8
Added a hook for util/ExportHtml.js
2012-08-11 13:02:01 -05:00
Marcel Klehr
75c07ad569
Check in tools/doc/node_modules
2012-08-11 13:18:17 +02:00
Mark Holmquist
44878bc0a3
Add in a plugin hook "handleClientMessage_<MSG_NAME>"
...
The new hook will accept only the message named in the hook call.
It will be used primarily for adding new message handlers, but it
can alse be used to handle existing message types.
2012-08-10 09:51:18 -07:00
Mark Holmquist
14da09dddd
Add in docs for the new hook I just added
2012-08-10 09:49:43 -07:00
Marcel Klehr
d9d28369b2
Create author2sessions.sessionIDs if it doesn't exist yet.
2012-08-10 16:20:07 +02:00
Marcel Klehr
d6a0cfc398
Create group2sessions.sessionIDs if it doesn't exist yet.
2012-08-09 11:15:26 +02:00
Marcel Klehr
453c68da19
Add doc generator.
2012-08-08 20:56:56 +02:00
Mark Holmquist
e491476a0f
Added in docs for the HTTP call I just added
2012-08-08 10:26:18 -07:00
Mark Holmquist
3d4fb81796
Add in an HTTP API call to send a custom message type.
...
You cannot currently send any data with your custom message, but
this patch is just begging for a second one that will allow that.
2012-08-08 10:12:11 -07:00
Marcel Klehr
db4ae500a1
Fix markup.
2012-08-07 20:29:44 +02:00
Marcel Klehr
7e2820a674
Remove file endings from includes.
2012-08-07 20:21:11 +02:00
Marcel Klehr
70fb765118
Restructure headings.
2012-08-07 20:19:37 +02:00
Marcel Klehr
cb0066f7b4
Update socket.io
2012-08-07 19:40:45 +02:00