libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,014 Commits 2 Branches 0 Tags 24 MiB
Commit Graph

2014 Commits

Author SHA1 Message Date
Charlie DeTar 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
Chad Weider a0177e5d3c Remember, the `class` symbol is reserved in some environments. 
Fixes issue introduced in 9be69ef258.
 2012-09-16 18:07:55 -07:00
Charlie DeTar 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
John McLear 6f37de2fae Update src/package.json 
Bump to v 1.1.2
 2012-09-14 17:33:45 +02:00
John McLear 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
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
lepidum 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
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
John McLear 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
Marcel Klehr ad16c0d0d4 Bump API version to v1.1 2012-09-13 16:13:54 +02:00
johnyma22 c8b6d3b4f3 attempt to put correct init in right place but could be wrong 2012-09-12 19:38:53 +01:00
johnyma22 603f251824 error handling and close is removed in express 3 2012-09-12 19:34:33 +01:00
John McLear 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
Marcel Klehr 40572b13b9 Document, how return values of hooks are handled. 2012-09-12 17:15:38 +02:00
John McLear d44c7f0bb5 Merge pull request #994 from cweider/parent-plugins 
Parent plugins
 2012-09-12 04:52:38 -07:00
John McLear 389e0d09b0 Merge pull request #740 from cweider/plugin-cleanup 
Plugin cleanup
 2012-09-12 04:52:23 -07:00
John McLear f105cf2646 Merge pull request #995 from cweider/fix-caching 
Fix cache headers for missing files.
 2012-09-12 04:48:09 -07:00
Chad Weider feeab5c1b2 Fix cache headers for missing files. 2012-09-11 22:27:14 -07:00
Chad Weider 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
Chad Weider 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
Chad Weider 9394495364 Inject plugins into hooks. 2012-09-11 21:16:47 -07:00
Chad Weider 3631f0ece3 Inject special normalization behavior. 2012-09-11 21:16:47 -07:00
Chad Weider e375b6212a Static functions are static. 2012-09-11 21:16:47 -07:00
Chad Weider b0d71df604 Fix worthless indentation. 2012-09-11 21:16:47 -07:00
Gedion a25feed1c2 fixed indentation 2012-09-11 17:49:58 -05:00
Gedion 3364eb131e fixed comments 2012-09-11 17:02:53 -05:00
Gedion 9be69ef258 fixed plugins 2012-09-11 16:21:14 -05:00
John McLear 70fe1a7451 Update bin/installOnWindows.bat 2012-09-11 22:15:48 +02:00
John McLear 693b9832ec Merge pull request #991 from marcelklehr/fix/multiple-sessions 
Don't break if there is no session cookie.
 2012-09-11 12:00:58 -07:00
Marcel Klehr d05d587f21 Don't break if there is no session cookie. 2012-09-11 20:59:19 +02:00
John McLear a4bd92c184 Merge pull request #983 from Pita/feature/multiple-api-versions 
Add support for multiple api versions
 2012-09-11 11:29:24 -07:00
John McLear 2d274820ba Merge pull request #701 from cweider/modules 
Reuse NPM Modules
 2012-09-11 07:24:55 -07:00
John McLear 3cb9efb865 Merge pull request #988 from marcelklehr/update/reorganize-readme 
Improve and reorganize the README
 2012-09-10 08:35:57 -07:00
Marcel Klehr 9bb2bef50d Improve and reorganize the README 2012-09-10 14:44:06 +02:00
Chad Weider 03bcd07741 Use packaged version of Tinycon. 2012-09-09 18:18:59 -07:00
Chad Weider 1541237654 Use packaged version of UNorm. 2012-09-09 18:18:59 -07:00
Chad Weider 19a7208c97 Clean up requires. 2012-09-09 18:18:59 -07:00
Chad Weider 0da4acfdb5 Use packaged edition of async. 2012-09-09 18:18:59 -07:00
Chad Weider 8e735b0841 Use packaged edition of underscore. 2012-09-09 18:18:59 -07:00
Chad Weider b47f6ae905 Use packaged edition of security module. 2012-09-09 18:18:59 -07:00
Chad Weider c4fa2ecddb Don't prefix libraries that are prefixed by '$'. #hack 2012-09-09 18:18:58 -07:00
Chad Weider 3b40850195 Add index paths in tar processing. 2012-09-09 18:18:58 -07:00
Chad Weider a5653c7192 Clean up tar file processing. 2012-09-09 18:18:58 -07:00
Chad Weider b8faf1f78b Serve libraries from node_modules. 2012-09-09 18:18:58 -07:00
Chad Weider 766c301a44 Only files should be treated as being existant. 2012-09-09 18:13:37 -07:00
John McLear 32b4729305 Merge pull request #987 from cweider/loopback-avoidance 
Windows server fixes
 2012-09-09 15:50:42 -07:00
Chad Weider a97b83babc Another workaround for Windows paths. 2012-09-09 14:42:32 -07:00
Chad Weider 3b5ea88bf5 If the file was not found this should be nothing. 2012-09-09 14:42:32 -07:00
Chad Weider 3312387b08 Drop embedding of modules. 
With loopback removed, embedding concatenated resources doesn't happen. It
was a marginal feature to begin with so it will not be missed.
 2012-09-09 14:40:20 -07:00
Marcel Klehr ea0f7cb2e9 Add support for multiple api versions 2012-09-09 18:20:16 +02:00