49799bfa97
Merge pull request #1018 from cweider/fix-windows
...
Upgrade to Yajsml with another Windows backslash fix.
2012-09-22 07:17:53 -07:00
1c38f5bab9
Update docs
2012-09-22 16:04:30 +02:00
0c9c1f514f
Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)
2012-09-22 16:03:40 +02:00
0f436d5916
Migrate error handling middleware to express v3
2012-09-22 15:22:15 +02:00
794c3d1afe
Set secret on cookieParser (migrate to express v3)
2012-09-22 14:05:41 +02:00
71579d1478
Fix res.send (migrate to express v3)
2012-09-22 13:51:39 +02:00
3c828ab1a6
Merge pull request #1019 from marcelklehr/feature/github-contributing-file
...
Let Github know our Dev Guidelines
2012-09-22 04:04:16 -07:00
087560ea6c
Let Github know our Dev Guidelines
...
https://github.com/blog/1184-contributing-guidelines
2012-09-22 12:55:49 +02:00
622819ba93
Make intialization of Ace2Inner analogous to other page controllers.
2012-09-21 22:09:55 -07:00
9f5946c942
Reformat Ace2Editor frame boot scripts.
2012-09-21 22:09:55 -07:00
fa65f889ec
Consolidate Ace2Editor frame's boot script.
2012-09-21 22:09:55 -07:00
49915dfeb8
Upgrade to Yajsml with another Windows backslash fix.
2012-09-21 22:09:44 -07:00
ff7cf991c9
Upgrade log4js to v0.5
2012-09-21 21:39:08 +02:00
4416210471
Differentiate between http server and express app
2012-09-21 17:12:22 +02:00
cd3e65e043
Merge pull request #1015 from marcelklehr/fix/multiSession-foreach
...
Fix async.forEach in MultiSession code
2012-09-19 10:07:20 -07:00
a72ade4494
Fix async.forEach in MultiSession code
2012-09-19 17:48:26 +02:00
b9da0e187e
Revert "Fixed foreach loop on session IDs, was breaking EP on single session in cookie."
...
This reverts commit 443a71bc9c
2012-09-19 17:42:36 +02:00
0883043eb9
Merge pull request #1014 from marcelklehr/feature/list-all-groups
...
Add listAllGroups API endpoint
2012-09-18 15:36:19 -07:00
f81a110229
Merge pull request #1013 from eldiddio/develop
...
Fixed foreach loop on session IDs, was breaking EP on single session in cookie
2012-09-18 08:53:43 -07:00
443a71bc9c
Fixed foreach loop on session IDs, was breaking EP on single session in cookie.
2012-09-18 16:30:26 +01:00
923b51033b
List 12 plugins instead of 4
...
4 was a bit stingy :) 12 is a bit more friendly from a UX persepctive.
2012-09-18 15:54:08 +02:00
363ce7a9ad
Merge pull request #1008 from marcelklehr/fix/api-v1.1
...
Still support API endpoints of v1 in v1.1
2012-09-17 14:19:31 -07:00
f8f002adc0
Add listAllGroups API endpoint
...
Adds a database key that lists all groups
2012-09-17 23:03:56 +02:00
53113644a0
Require userColor to be valid css hex
...
The utility functions colorutils.js assume that background colors are in
CSS hex format, so require userColor to do the same, rather than
allowing inputs like "red" and "rgba(...)", to insure that inversion
checks will succeed.
2012-09-17 10:59:12 -04:00
bbc8848af3
Still support API endpoints of v1 in v1.1
2012-09-17 16:29:39 +02:00
9cfcafb852
Merge pull request #1005 from cweider/fix-ie
...
Remember, the `class` symbol is reserved in some environments.
2012-09-17 04:53:42 -07:00
bc6e495e8c
Use 'transparent' as reference to validate css
...
Use 'transparent' instead of 'white' as a reference color for validating
CSS color values. Presumably, a user setting a userColor wants some
color other than 'transparent' if they are setting it (they could always
duplicate the background's color if not).
2012-09-17 00:19:57 -04:00
a0177e5d3c
Remember, the `class` symbol is reserved in some environments.
...
Fixes issue introduced in 9be69ef258
2012-09-16 18:07:55 -07:00
afc90604bf
Add `userColor` query param to set initial color
...
Add a URL parameter which sets the initial color for a user, e.g.:
http://example.com/p/mypad?userColor=%2300ff00
Sanitize the given color value to ensure that it's a valid css value
(could be any supported CSS color format -- #fff, rgba(), "red", etc).
Shortly after rejoining a pad, the server responds with a USER_NEWINFO
message which may contain an old color value; however, this message
arrives after we have set and sent the new color value to the server.
To avoid this race condition, if the query parameter has been set,
ignore the color value in a USER_NEWINFO message which matches our user
ID.
2012-09-15 17:48:04 -04:00
2cd586e022
Resolve merge conflicts
...
Conflicts:
README.md
2012-09-15 19:49:29 +02:00
6f37de2fae
Update src/package.json
...
Bump to v 1.1.2
2012-09-14 17:33:45 +02:00
e9e3ea305b
Merge pull request #992 from gedion/develop
...
Added hooks and made some ace functions available to editorInfo Object
2012-09-14 04:51:17 -07:00
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
22315cd30e
Merge pull request #2 from ayokura/fix-international-composition
...
Fixed international composition issues (e.g., Japanese Input method)
2012-09-14 00:17:49 -07:00
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
c2f5fc32cc
Merge pull request #998 from marcelklehr/bump/api-version-1.1
...
Bump API version to v1.1
2012-09-13 07:20:44 -07:00
ad16c0d0d4
Bump API version to v1.1
2012-09-13 16:13:54 +02:00
c8b6d3b4f3
attempt to put correct init in right place but could be wrong
2012-09-12 19:38:53 +01:00
603f251824
error handling and close is removed in express 3
2012-09-12 19:34:33 +01:00
f3abe6e970
Merge pull request #996 from marcelklehr/doc/hook-return-values
...
Document, how return values of hooks are handled.
2012-09-12 10:37:28 -07:00
40572b13b9
Document, how return values of hooks are handled.
2012-09-12 17:15:38 +02:00
d44c7f0bb5
Merge pull request #994 from cweider/parent-plugins
...
Parent plugins
2012-09-12 04:52:38 -07:00
389e0d09b0
Merge pull request #740 from cweider/plugin-cleanup
...
Plugin cleanup
2012-09-12 04:52:23 -07:00
f105cf2646
Merge pull request #995 from cweider/fix-caching
...
Fix cache headers for missing files.
2012-09-12 04:48:09 -07:00
feeab5c1b2
Fix cache headers for missing files.
2012-09-11 22:27:14 -07:00
b691606c4e
Replace ParentRequire hack.
...
Instead of hacking with the internals of require, make client_plugins aware
and capable of sharing behavior.
2012-09-11 21:16:47 -07:00
1258ed3a0d
Split client and server plugin functionality.
...
There is virtually no shared code for the client, extract it into its own
module and do away with the switches.
2012-09-11 21:16:47 -07:00
9394495364
Inject plugins into hooks.
2012-09-11 21:16:47 -07:00
3631f0ece3
Inject special normalization behavior.
2012-09-11 21:16:47 -07:00
e375b6212a
Static functions are static.
2012-09-11 21:16:47 -07:00
Marcel Klehr