Commit graph

2214 commits

Author SHA1 Message Date
Gedion
c37c48cd12 added hooks and made some functions available to editor info object in ace 2012-09-08 13:45:33 -05:00
Gedion
6d1cba2259 added hooks to contentcollector.js 2012-09-08 12:11:04 -05:00
Gedion
a2c8d21240 added hooks to contentcollector.js 2012-09-08 12:03:13 -05:00
John McLear
453b6473a0 Merge pull request #984 from lepidum/develop
Fixed ESC key handling issue of Firefox 15
2012-09-07 06:23:57 -07:00
John McLear
0b072023f0 Merge pull request #982 from marcelklehr/doc/getAuthorName
Add in docs for getAuthorName API method
2012-09-06 04:02:47 -07:00
Marcel Klehr
eeb605334f Add in docs for getAuthorName API method 2012-09-06 12:13:41 +02:00
John McLear
3cbd59c769 Update src/node/db/AuthorManager.js 2012-09-04 22:47:56 +02:00
John McLear
890dbfde95 Merge pull request #979 from johnyma22/develop
Add getAuthorName API endpoint
2012-09-04 08:27:18 -07:00
John McLear
7e79bf3462 Update src/node/handler/APIHandler.js 2012-09-04 17:26:08 +02:00
John McLear
21dcce2296 Update src/node/db/AuthorManager.js 2012-09-04 17:25:19 +02:00
John McLear
40a7b43799 Update src/node/db/API.js 2012-09-04 17:23:33 +02:00
John McLear
c5be2eb418 Merge pull request #977 from cweider/loopback-avoidance
Loopback avoidance
2012-09-03 14:56:55 -07:00
Chad Weider
6e796eb5fb Make exception case for require kernel obvious. 2012-09-03 14:41:26 -07:00
Chad Weider
02c22d7b89 Remove loopback from Minify. 2012-09-03 14:38:28 -07:00
Chad Weider
024a26f272 Minify publishes its own mock request thing. 2012-09-03 14:37:26 -07:00
Chad Weider
4413d498d8 Minify is a named function. 2012-09-03 14:35:36 -07:00
John McLear
de7934d9fb Merge pull request #958 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues
Fix ie8 native xmlhttp support disabled issues
2012-09-03 06:35:52 -07:00
John McLear
23d22b92fd Merge pull request #968 from marcelklehr/feature/multiple-sessions-per-user
Multiple sessions per user
2012-09-03 05:14:43 -07:00
John McLear
b2c06e78d0 Merge pull request #969 from rasos/patch-1
Update README.md
2012-09-03 05:08:37 -07:00
rasos
7fe796f98e Update README.md: node download links and versions
node downloads corrected links and preferred versions
2012-09-03 15:01:09 +03:00
rasos
08fa0d23a8 Update README.md
npm cache clean jshint was the only way to get jshint installed correctly again..
2012-09-03 02:40:09 +03:00
Marcel Klehr
dad83d9b77 Document multi-session cookie feature 2012-09-02 19:51:40 +02:00
Marcel Klehr
8a696ab77d Expect a comma seperated list of sessionIDs in session cookie
This allows people to be active on more than one group.
2012-09-02 19:51:12 +02:00
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