seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
3,553 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

1257 Commits

Author SHA1 Message Date
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 d4a0d8d820 * force jenkins build 2014-05-08 08:11:39 -05:00
Seth Call f6b31a675f Merge branch 'develop' into feature/scheduled_sessions 2014-05-08 08:04:45 -05:00
Seth Call 42de732065 * whitespace change to readme to force develop branch build in jenkins 2014-05-07 18:48:45 -05:00
Seth Call 1cb9699096 * VRFS-1688 - beefed up history_show.rabl 2014-05-07 16:38:28 -05:00
Seth Call 88e13aa3fc * attempt to run problem test now that fix to nindex has been made 2014-05-07 15:14:42 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 57e8860dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 14:22:56 -05:00
Anthony Davis 4d4d04b343 VRFS-1651 - test-www should not use build_number 2014-05-07 08:30:41 -05:00
Seth Call 97269133ba Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 08:03:43 -05:00
Anthony Davis 1fa9ffcc3f VRFS-1651 - really no jam_* gems in test-www 2014-05-07 07:40:22 -05:00
Anthony Davis 6528c5f838 VRFS-1651 - our gems aren't even needed for this 2014-05-07 07:25:48 -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 9a5bd6887e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 00:17:01 -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
Anthony Davis a13e99cb19 VRFS-1651 - revert 2014-05-06 23:07:45 -05:00
Anthony Davis 9442256b97 VRFS-1651 - reverting Gemfile, adding check for test-www project 2014-05-06 23:05:29 -05:00
Anthony Davis 74d7d0b587 VRFS-1651 - decoupling jam_ gems from ENV 2014-05-06 22:57:32 -05:00
Anthony Davis 26e4a2b72d Merge remote-tracking branch 'origin/develop' into develop 2014-05-06 22:35:27 -05:00
Anthony Davis 673132c540 VRFS-1651 - periodic real test of www 2014-05-06 22:35:00 -05:00
Seth Call d72cdfda14 * pending for now 2014-05-06 22:04:37 -05:00
Seth Call 332aee8667 * adding verification that the update settings dialog is dismissed 2014-05-06 21:48:02 -05: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
Jonathan Kolyer 1c6b5b78bb VRFS-1577 fixing specs 2014-05-06 07:20:14 +00:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Seth Call acd1efd877 * wip 2014-05-05 10:06:27 -05:00
Scott Comer 6be0791adb merge 2014-05-02 15:20:21 -05:00
Scott Comer 5cc515d615 a small cleanup of connection fields and fix broken tests 2014-05-02 13:44:29 -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
Scott Comer fe59865bd9 change join_the_session api to add tracks; move the impl to connection; a few bug fixes 2014-04-30 22:01:43 -05: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