Commit graph

  • 0fd8490ca6 Changed pad_id to padID to follow projct standards. d-a-n 2012-10-03 15:49:28 +03:00
  • 358e481731 Changed pad hook names to follow naming conventions. Arguments will now be passed as hash. d-a-n 2012-10-03 13:41:40 +03:00
  • 754c559d63 Changed pad hook names to follow naming conventions. d-a-n 2012-10-03 13:35:31 +03:00
  • 2684a1d295 Merge branch 'develop' into express-v3 Marcel Klehr 2012-10-03 10:09:00 +02:00
  • a7ede30c0a Merge b29fc11e9d into 2cf46d3964 Chad Weider 2012-10-02 20:00:43 -07:00
  • c71be1ff1f Merge b29fc11e9d into a2394fc3a6 Chad Weider 2012-10-02 20:00:06 -07:00
  • b29fc11e9d Upgrade to Yajsml bug fix. Chad Weider 2012-10-02 19:57:18 -07:00
  • 85b44119ae USERINFO_UPDATE: construct a new message for broadcast Richard Braakman 2012-10-02 23:27:30 +03:00
  • 4652751285 Updated docs for new pad hooks (add, edit, remove) d-a-n 2012-10-02 22:32:30 +03:00
  • 64a3d60b94 Added pad hooks (create, load, edit, remove) d-a-n 2012-10-02 22:30:13 +03:00
  • c0f2e557d3 Updated docs for new pad hooks (add, edit, remove) d-a-n 2012-10-02 22:11:54 +03:00
  • 07c33c77c4 Updated docs for new pad hooks (add, edit, remove) d-a-n 2012-10-02 22:10:18 +03:00
  • 2cf46d3964 Merge pull request #1031 from gedion/develop John McLear 2012-10-02 11:31:58 -07:00
  • 1397091e05 Merge 6009903095 into c0a2202e34 Gedion Woldeselassie 2012-10-02 11:31:49 -07:00
  • c0a2202e34 Merge pull request #1033 from marcelklehr/fix/shutdown-on-middlware-error John McLear 2012-10-02 11:31:41 -07:00
  • af2d494fd5 Merge 7656001cb5 into 56453409a5 Marcel Klehr 2012-10-02 11:12:56 -07:00
  • 7656001cb5 Don't shut down the whole server, if error handling middleware is called. Marcel Klehr 2012-10-02 20:11:18 +02:00
  • 649a28b6c6 first user contributed test, note the two files that needed to be edited, this kinda sucks origin/feature/frontend-tests johnyma22 2012-10-02 15:32:31 +01:00
  • 56453409a5 Update src/static/js/pad_editbar.js John McLear 2012-10-02 02:19:44 +02:00
  • 6009903095 added comments to ace exposed methods Gedion 2012-10-01 19:18:19 -05:00
  • 61022be6e4 added comments to ace exposed methods Gedion 2012-10-01 19:14:27 -05:00
  • ba4ebbba3b Setted up an enviroment for frontend tests, first steps Peter 'Pita' Martischka 2012-10-02 00:35:43 +01:00
  • 7f6a81b0ed Merge pull request #1006 from cweider/ace-cleanup John McLear 2012-10-01 13:05:10 -07:00
  • 3fe3df91ae update docs for new hooks and ace exposures Gedion 2012-09-30 17:13:14 -05:00
  • a8c9395a44 Merge a479fa144e into c75941d1e3 Uli Köhler 2012-09-30 04:30:42 -07:00
  • 66db9aea47 Merge 622819ba93 into c75941d1e3 Chad Weider 2012-09-30 04:22:46 -07:00
  • c75941d1e3 Merge pull request #1028 from amtep/develop John McLear 2012-09-30 04:22:36 -07:00
  • d91b1ecd24 Merge pull request #1020 from marcelklehr/fix/express-v3 John McLear 2012-09-30 04:22:17 -07:00
  • a479fa144e Prepared logging code to be able to read log4js appenders from settings.json Uli Köhler 2012-09-29 23:26:58 +02:00
  • 970f3b181d Let Github know our Dev Guidelines Marcel Klehr 2012-09-22 12:55:49 +02:00
  • 71f615b310 Upgrade to Yajsml with another Windows backslash fix. Chad Weider 2012-09-21 21:58:49 -07:00
  • e2c25bcb6b Merge a2394fc3a6 into b2c06e78d0 John McLear 2012-09-29 09:54:08 -07:00
  • a2394fc3a6 Merge branch 'develop' into releases-1.1.2 1.1.2 Peter 'Pita' Martischka 2012-09-29 17:52:56 +01:00
  • 14e25b2c6a Merge 2e72a1e489 into 3578e36616 Richard Braakman 2012-09-28 14:22:43 -07:00
  • 2e72a1e489 Prevent server crash in handleClientReady Richard Braakman 2012-09-28 23:03:42 +03:00
  • 413ddb393e Add some explanatory comments to handleUserChanges() Richard Braakman 2012-09-28 22:49:20 +03:00
  • 3578e36616 Merge pull request #1025 from amtep/develop Marcel Klehr 2012-09-28 05:43:47 -07:00
  • 4e5163d5c5 Merge 7aaef01346 into 49799bfa97 Richard Braakman 2012-09-27 13:07:58 -07:00
  • 7aaef01346 Prettify session handling in handleUserChanges Richard Braakman 2012-09-27 23:05:18 +03:00
  • f1b4206cad Fix crash when client submits changeset based on too-old revision Richard Braakman 2012-09-26 03:01:24 +03:00
  • e16008b371 Fix sessioninfos race that can cause crash during USER_CHANGES handling Richard Braakman 2012-09-26 03:01:53 +03:00
  • 49799bfa97 Merge pull request #1018 from cweider/fix-windows Marcel Klehr 2012-09-22 07:17:53 -07:00
  • daea54ec6b Merge 49915dfeb8 into 3c828ab1a6 Chad Weider 2012-09-22 07:13:08 -07:00
  • 8ccf7190e3 Merge 1c38f5bab9 into c8b6d3b4f3 Marcel Klehr 2012-09-22 07:04:52 -07:00
  • 1c38f5bab9 Update docs Marcel Klehr 2012-09-22 16:04:30 +02:00
  • 0c9c1f514f Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3) Marcel Klehr 2012-09-22 16:03:40 +02:00
  • 0f436d5916 Migrate error handling middleware to express v3 Marcel Klehr 2012-09-22 15:22:15 +02:00
  • 794c3d1afe Set secret on cookieParser (migrate to express v3) Marcel Klehr 2012-09-22 14:05:41 +02:00
  • 71579d1478 Fix res.send (migrate to express v3) Marcel Klehr 2012-09-22 13:51:39 +02:00
  • 3c828ab1a6 Merge pull request #1019 from marcelklehr/feature/github-contributing-file John McLear 2012-09-22 04:04:16 -07:00
  • aa3d53b034 Merge 087560ea6c into cd3e65e043 Marcel Klehr 2012-09-22 03:56:50 -07:00
  • 087560ea6c Let Github know our Dev Guidelines Marcel Klehr 2012-09-22 12:55:49 +02:00
  • 622819ba93 Make intialization of Ace2Inner analogous to other page controllers. Chad Weider 2012-09-12 00:04:15 -07:00
  • 9f5946c942 Reformat Ace2Editor frame boot scripts. Chad Weider 2012-09-11 20:59:50 -07:00
  • fa65f889ec Consolidate Ace2Editor frame's boot script. Chad Weider 2012-09-11 20:52:48 -07:00
  • 49915dfeb8 Upgrade to Yajsml with another Windows backslash fix. Chad Weider 2012-09-21 21:58:49 -07:00
  • ff7cf991c9 Upgrade log4js to v0.5 Marcel Klehr 2012-09-21 21:39:08 +02:00
  • 4416210471 Differentiate between http server and express app Marcel Klehr 2012-09-21 17:12:22 +02:00
  • 56355dbbc0 Fixed log4js configuration error in bin/extractPadData.js Uli Köhler 2012-09-20 16:07:16 +02:00
  • caf125a798 Added user-configurable logging defaulting to console logging Uli Köhler 2012-09-20 09:40:41 +02:00
  • cd3e65e043 Merge pull request #1015 from marcelklehr/fix/multiSession-foreach John McLear 2012-09-19 10:07:20 -07:00
  • 77f0e4f9ac Merge a72ade4494 into 0883043eb9 Marcel Klehr 2012-09-19 08:50:04 -07:00
  • a72ade4494 Fix async.forEach in MultiSession code Marcel Klehr 2012-09-19 17:48:26 +02:00
  • b9da0e187e Revert "Fixed foreach loop on session IDs, was breaking EP on single session in cookie." Marcel Klehr 2012-09-19 17:42:36 +02:00
  • 0883043eb9 Merge pull request #1014 from marcelklehr/feature/list-all-groups John McLear 2012-09-18 15:36:19 -07:00
  • 71cd1c7b04 Merge f8f002adc0 into f81a110229 Marcel Klehr 2012-09-18 09:00:53 -07:00
  • f81a110229 Merge pull request #1013 from eldiddio/develop John McLear 2012-09-18 08:53:43 -07:00
  • 42d5c1aed6 Merge 443a71bc9c into 923b51033b Mark 2012-09-18 08:53:36 -07:00
  • 443a71bc9c Fixed foreach loop on session IDs, was breaking EP on single session in cookie. johnyma22 2012-09-18 16:30:26 +01:00
  • 923b51033b List 12 plugins instead of 4 John McLear 2012-09-18 15:54:08 +02:00
  • 363ce7a9ad Merge pull request #1008 from marcelklehr/fix/api-v1.1 John McLear 2012-09-17 14:19:31 -07:00
  • f8f002adc0 Add listAllGroups API endpoint Marcel Klehr 2012-09-17 23:03:56 +02:00
  • 53113644a0 Require userColor to be valid css hex Charlie DeTar 2012-09-17 10:59:12 -04:00
  • 0b997a11b7 Merge bbc8848af3 into 9cfcafb852 Marcel Klehr 2012-09-17 07:31:02 -07:00
  • bbc8848af3 Still support API endpoints of v1 in v1.1 Marcel Klehr 2012-09-17 16:29:39 +02:00
  • 9cfcafb852 Merge pull request #1005 from cweider/fix-ie John McLear 2012-09-17 04:53:42 -07:00
  • bc6e495e8c Use 'transparent' as reference to validate css Charlie DeTar 2012-09-17 00:19:57 -04:00
  • 36e3916ce0 Merge a0177e5d3c into 6f37de2fae Chad Weider 2012-09-16 18:11:54 -07:00
  • a0177e5d3c Remember, the class symbol is reserved in some environments. Chad Weider 2012-09-16 18:07:55 -07:00
  • afc90604bf Add userColor query param to set initial color Charlie DeTar 2012-09-15 17:48:04 -04:00
  • 2cd586e022 Resolve merge conflicts Marcel Klehr 2012-09-15 19:49:29 +02:00
  • e3b96d616f Merge 283ae3340f into b2c06e78d0 yourcelf 2012-09-15 10:49:21 -07:00
  • 283ae3340f Add userColor query param to set initial color Charlie DeTar 2012-09-15 13:42:57 -04:00
  • 6f37de2fae Update src/package.json John McLear 2012-09-14 17:33:45 +02:00
  • e9e3ea305b Merge pull request #992 from gedion/develop John McLear 2012-09-14 04:51:17 -07:00
  • a859622331 Merge a25feed1c2 into ba8177fc6f Gedion Woldeselassie 2012-09-14 04:50:55 -07:00
  • ba8177fc6f Merge pull request #999 from lepidum/develop John McLear 2012-09-14 04:50:08 -07:00
  • 758ae2bd9d Merge 22315cd30e into c2f5fc32cc lepidum 2012-09-14 00:32:23 -07:00
  • 22315cd30e Merge pull request #2 from ayokura/fix-international-composition lepidum 2012-09-14 00:17:49 -07:00
  • 71c9444694 fix for InternationalComposition(e.g., Japanese Input) NAGOYA, Yoshihiko 2012-09-13 23:19:53 +09:00
  • c2f5fc32cc Merge pull request #998 from marcelklehr/bump/api-version-1.1 John McLear 2012-09-13 07:20:44 -07:00
  • faaad77953 Merge ad16c0d0d4 into f3abe6e970 Marcel Klehr 2012-09-13 07:20:23 -07:00
  • ad16c0d0d4 Bump API version to v1.1 Marcel Klehr 2012-09-13 16:13:54 +02:00
  • c8b6d3b4f3 attempt to put correct init in right place but could be wrong johnyma22 2012-09-12 19:38:53 +01:00
  • 603f251824 error handling and close is removed in express 3 johnyma22 2012-09-12 19:34:33 +01:00
  • f3abe6e970 Merge pull request #996 from marcelklehr/doc/hook-return-values John McLear 2012-09-12 10:37:28 -07:00
  • aa1635a332 Merge 40572b13b9 into d44c7f0bb5 Marcel Klehr 2012-09-12 08:16:48 -07:00
  • 40572b13b9 Document, how return values of hooks are handled. Marcel Klehr 2012-09-12 17:15:38 +02:00
  • d44c7f0bb5 Merge pull request #994 from cweider/parent-plugins John McLear 2012-09-12 04:52:38 -07:00
  • 60ce24d1a3 Merge b691606c4e into 389e0d09b0 Chad Weider 2012-09-12 04:52:30 -07:00