Commit Graph

640 Commits

Author SHA1 Message Date
Brian Smith 4d63dad502 VRFS-1671 RSVP submit dialog 2014-05-28 23:43:57 -04:00
Brian Smith fea728923f VRFS-1671 RSVP submit dialog work 2014-05-28 01:14:14 -04:00
Brian Smith c7fc7bdc22 VRFS-1668 clean up notifications / fix comment notification for session info page 2014-05-27 22:35:26 -04:00
Brian Smith 860704f874 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-27 21:31:42 -04:00
Brian Smith 6dc8192516 session info permissioning work 2014-05-27 21:31:39 -04:00
Seth Call 93ddd02bd1 * using extra_js block to initialize page code 2014-05-27 11:00:08 -05:00
Brian Smith f31248815d VRFS-1670 session info page work 2014-05-26 23:52:59 -04:00
Brian Smith cc4686ab79 VRFS-1670 session info page work 2014-05-26 01:35:57 -04:00
Brian Smith 16b240fdc8 merge scheduled_sessions branch 2014-05-24 04:01:40 -04:00
Brian Smith a06ba7197e VRFS-1670 session info page work 2014-05-24 03:58:47 -04:00
Brian Smith 03eb125fa8 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-22 00:42:33 -04:00
Bert Owen 1904c8f474 VRFS-1675 completed 2014-05-22 00:24:40 +08:00
Bert Owen 22f4d0ffc5 Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-20 21:26:55 +08:00
Bert Owen cebbd869cb VRFS-1675 add join session feature 2014-05-20 21:26:32 +08:00
Seth Call d11261c5c6 * VRFS-1730 - websocket on web layout 2014-05-20 00:33:43 -04:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Brian Smith 8fc30baf42 VRFS-1668 more notification work 2014-05-18 00:09:21 -04:00
Brian Smith baee1b7506 VRFS-1668 merge with test fixes for notification changes 2014-05-15 01:06:48 -04:00
Brian Smith 27517c673f VRFS-1668 more test fixes 2014-05-14 01:51:18 -04:00
Brian Smith 212ef168c9 VRFS-1668 fixing tests related to notification changes 2014-05-14 01:16:33 -04:00
Seth Call 9ee27a5127 Revert "VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic"
This reverts commit 2302c89154.
2014-05-13 08:21:32 -05:00
Brian Smith 2302c89154 VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic 2014-05-13 01:22:23 -04:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 5f1ea4c754 * merging manifest 2014-05-07 05:17:17 -05:00
Brian Smith c549128c90 VRFS-1562 make musician/band avatar and name clickable in hover bubbles 2014-05-07 00:26:38 -04:00
Brian Smith 58b7f27387 VRFS-1562 make musician/band avatar and name clickable in hover bubbles 2014-05-07 00:16:20 -04:00
Jonathan Kolyer ebe9aa1047 VRFS-1577 VRFS-736 2014-05-07 01:33:27 +00:00
Seth Call 7dd1e6c464 * renaming of tables in 2014-05-06 17:50:41 -05:00
Seth Call 732fd66f0e * all tests pass; but need to now rename music session tables to match class names... 2014-05-06 16:17:26 -05:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Bert Owen 7d3ac6fc54 VRFS-1503 implement session chat feature 2014-05-03 00:33:27 +08:00
Bert Owen bf04fca205 VRFS-1503 implement session chat feature 2014-05-03 00:30:56 +08:00
Seth Call c0ce26c602 * fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-05-01 14:09:33 -05:00
Jonathan Kolyer affb1cd875 VRFS-1577 2014-05-01 06:35:16 +00:00
Jonathan Kolyer b1be072c6c VRFS-1577 VRFS-736 2014-05-01 01:48:57 +00:00
Jonathan Kolyer 2cbfae2215 VRFS-1577 VRFS-736 2014-04-30 20:49:32 +00:00
Seth Call ad266e5b80 * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-04-30 15:29:10 -05:00
Jonathan Kolyer 968dff2829 VRFS-1577 VRFS-736 2014-04-30 16:44:37 +00:00
Jonathan Kolyer 2ee96c49ec merging develop 2014-04-30 14:21:23 +00:00
Jonathan Kolyer dddc0311c0 VRFS-1577 VRFS-736 session ratings 2014-04-30 14:07:23 +00:00
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Seth Call 264d65d98b * merged in more websocket fixes 2014-04-29 14:22:23 +00:00
Seth Call 8262725aae * merging in some gateway fixes 2014-04-29 14:19:42 +00:00
Brian Smith 4b98350f48 remove debug logs 2014-04-29 03:36:09 -04:00
Brian Smith 8b43e63800 VRFS-1558 added tests 2014-04-29 03:33:37 -04:00
Brian Smith 8eedd63d7f Merge branch 'develop' into feature/widget_fixes_1558 2014-04-28 23:22:08 -04:00
Brian Smith 4e188d74b7 VRFS-1562 make avatars clickable links (this commit addresses Feed and comment dialog only) 2014-04-27 20:28:25 -04:00
Brian Smith 2b7ef1df55 VRFS-1350 hover bubble style improvements 2014-04-27 19:00:18 -04:00