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,551 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

531 Commits

Author SHA1 Message Date
Bert Owen 2c58ded35f VRFS-1700 fixed 2014-05-10 00:37:51 +08:00
Scott Comer ca27a6ab97 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 
Conflicts:
	db/manifest
 2014-05-08 19:47:17 -05:00
Scott Comer 3f688a8392 update user home base (last_jam_blah) fields upon registation and joining a music session as a musician 2014-05-08 19:44:52 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 6817d2f458 * fixing another bug in the SQL of MusicSession.index and MusicSession.index (bad inner join with music_session and active_music_session) 2014-05-07 14:16:35 -05:00
Seth Call 23aec0d1a5 * uncommenting the index tests; fixed a bug too 2014-05-07 10:53:39 -05:00
Seth Call 5f1ea4c754 * merging manifest 2014-05-07 05:17:17 -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 23082beb2f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-06 08:34:54 -05:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Jonathan Kolyer 5f74bce061 VRFS-1577 2014-05-06 06:41:10 +00:00
Jonathan Kolyer 294bb22cdd Merge branch 'develop' into vrfs1577 2014-05-06 05:21:31 +00:00
Jonathan Kolyer 0119001d3d VRFS-1698 testing 2014-05-06 05:21:09 +00:00
Jonathan Kolyer a519191394 replaced find with find_by_id 2014-05-06 02:55:32 +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 53850a716b * fixing bad ref to user_id in client cleanup code 2014-05-02 07:33:41 -05: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 a11dd664ce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-30 22:01:57 -05: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 5e27268fa4 VRFS-1577 VRFS-736 added should_rate_session?; fixed bug in add_rating 2014-05-01 01:46:57 +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 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 6463512420 * a fix for race condition that can hang eventmachine startup 2014-04-30 03:03:37 +00:00
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Seth Call 3e2f39cc85 * VRFS-1653 - don't bother with cleanup in onerror, and make startup of EventMachine better (VRFS-1659) 2014-04-29 16:27:50 +00:00
Scott Comer e82ae132bd fix method for adding connection to music session 2014-04-28 22:38:30 -05:00
Seth Call 26dc80436c * merging build script 2014-04-24 18:07:52 +00:00
Seth Call 26a9f9a162 * commenting 'Measurement Protocol' into related classes 2014-04-24 02:27:31 +00:00
Seth Call 29dfba8276 * fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643 2014-04-23 15:08:19 +00:00
Bert Owen 3921324b32 VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:34:59 +02:00
Bert Owen 07e141cc8f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:49 +02:00
Jonathan Kolyer ed09892284 merging develop and vrfs1576 2014-04-23 07:50:50 +00:00
Jonathan Kolyer 22566f1b29 VRFS-1576 added block to referrals_by_date 2014-04-23 06:34:21 +00:00
Jonathan Kolyer c66f5879cf VRFS-1576 fixed referrals_by_date to support pagination 2014-04-23 02:43:13 +00:00
Seth Call 5695338266 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-22 17:53:49 +00:00
Seth Call 30ca8d7c5c * wip still on new ftue. also push release branches to repository VRFS-1639 2014-04-22 17:53:41 +00:00
Jonathan Kolyer b232344336 VRFS-1576 added referrals_by_date and associated test 2014-04-22 07:12:05 +00:00
Jonathan Kolyer af63b03d6a VRFS-1576 case insensitive codes 2014-04-22 02:14:22 +00:00
Jonathan Kolyer 6ee83f8dcc VRFS-1576 error handling; referral page; new admin menu 2014-04-22 01:55:40 +00:00
Bert Owen 15064ad6c0 VRFS-1567 fix default sender, add new migration for email_batches table 2014-04-21 10:39:08 -07:00
Bert Owen 4cfc1b878a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-21 17:18:11 +02:00