Commit Graph

366 Commits

Author SHA1 Message Date
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Seth Call 3d1c4f2488 * VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message 2014-06-19 14:05:33 -05:00
Brian Smith 74d5053a8a allow session organizer to create RSVP for self without having invitation 2014-06-18 22:32:21 -04:00
Seth Call 39a55f562c * VRFS-1684 and VRFS-1684 (find session APIs) completede 2014-06-17 17:16:49 -05:00
Seth Call 106222638f * VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index 2014-06-17 14:10:24 -05:00
Brian Smith 35f630bdd7 VRFS-1690 add autoapprove option to RSVP creation 2014-06-16 08:11:05 -04:00
Brian Smith 87a74e235d Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-16 01:47:07 -04:00
Brian Smith 75b22ced5b added ability to retrieve RSVP requests by approval status 2014-06-16 01:46:52 -04:00
Scott Comer d02e10def5 fix asm_index stored procedure to populate all users of active sessionsinto ams_users_tmp whether they have scores or not 2014-06-15 19:26:13 -05:00
Scott Comer 740d48631a added ams_users invocation to ams_index method of controller; fixed bug in spec relating to user id accessor of user object 2014-06-15 10:58:19 -05:00
Scott Comer 07c1a4c85d added attribute accessors for music_session_id and latency; added access to ams_users_tmp via ams_users method in ActiveMusicSession; added test of same in the spec 2014-06-15 10:35:15 -05:00
Scott Comer 3c3565893d wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction 2014-06-14 21:27:34 -05:00
Scott Comer 2799a6443e added asm_index method to controller and fix a few issues with asm_index and included a simple test 2014-06-13 23:51:54 -05:00
Brian Smith 5fc9696d01 merge develop 2014-06-11 08:45:34 -04:00
Brian Smith 4c758f3185 VRFS-1749 finished RsvpSlot model tests 2014-06-10 01:08:28 -04:00
Brian Smith 0fe76dae13 VRFS-1749 finished RsvpRequest model tests 2014-06-10 00:35:38 -04:00
Seth Call 4a603cbaa2 * VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives 2014-06-09 15:43:16 -05:00
Jonathan Kolyer 5ed3a3de81 VRFS-1664 added test as if from queue 2014-06-09 05:40:25 +00:00
Jonathan Kolyer e547ced63d VRFS-1664 updating tests with date mgmt 2014-06-09 05:35:39 +00:00
Jonathan Kolyer c0287cc224 VRFS-1664 enhancing tests 2014-06-09 05:12:29 +00:00
Brian Smith c66da4d945 VRFS-1749 RsvpRequest model tests wip 2014-06-07 16:37:50 -04:00
Brian Smith 02a0ea12ac VRFS-1749 RsvpRequest model tests wip 2014-06-07 13:19:02 -04:00
Brian Smith a09326470e VRFS-1749 RsvpRequest model tests wip 2014-06-07 13:01:03 -04:00
Jonathan Kolyer 2932d02894 VRFS-1664 added periodical test 2014-06-06 06:09:35 +00:00
Jonathan Kolyer 18167e898d VRFS-1665 added large batch test 2014-06-06 05:31:53 +00:00
Jonathan Kolyer 0aa98146fe VRFS-1664 reformatting code 2014-06-06 03:56:32 +00:00
Jonathan Kolyer a657236814 VRFS-1664 fixed large batch test 2014-06-05 16:29:01 +00:00
Jonathan Kolyer e669205c64 VRFS-1664 added looping test 2014-06-05 15:42:23 +00:00
Jonathan Kolyer 84ed2949f6 VRFS-736 refactoring tests 2014-06-03 04:21:00 +00:00
Jonathan Kolyer abc1044431 VRFS-1664 added another test 2014-06-03 04:03:02 +00:00
Jonathan Kolyer 8d35ea09e8 VRFS-1664 added another test 2014-06-03 04:01:48 +00:00
Jonathan Kolyer d36ec17436 VRFS-1664 fixed mail sending test 2014-06-03 03:25:23 +00:00
Jonathan Kolyer 1f726df320 VRFS-1665 prevent session creator from getting notified of sessions 2014-06-02 06:17:31 +00:00
Jonathan Kolyer 7ea659c71f VRFS-1665 rewrote daily email queries and adding pagination; other tweaks 2014-06-02 06:01:55 +00:00
Jonathan Kolyer 4f5adf1340 VRFS-1664 fixing query 2014-05-31 20:41:48 +00:00
Jonathan Kolyer edbd3b1c6d VRFS-1664 new musicians email 2014-05-31 19:09:18 +00:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Brian Smith 5b438ffaef Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-31 07:35:07 -04:00
Brian Smith e1e89d55e8 VRFS-1672 session settings dialog work / other bug fixes 2014-05-31 07:34:52 -04:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Jonathan Kolyer 77b6bdf106 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-29 16:32:29 +00:00
Jonathan Kolyer f90f55fb11 VRFS-1665 added mail delivery test 2014-05-29 09:15:46 +00:00
Jonathan Kolyer f4533ebbf1 VRFS-1665 added non-pass case 2014-05-29 07:41:28 +00:00
Jonathan Kolyer 243e06533b VRFS-1665 scheduled session impl 2014-05-29 07:19:55 +00:00
Brian Smith 69c92e1f76 fix test 2014-05-29 00:45:31 -04:00
Brian Smith 7a4ad83cef merge develop 2014-05-29 00:20:09 -04:00
Scott Comer ebfe72e11d fix tests for scoring musician search 2014-05-28 21:19:50 -05:00
Scott Comer 6f57265a0d finish up mods for geocoding based on scores 2014-05-27 11:52:18 -05:00
Scott Comer 7446898071 added tests for new_musicians 2014-05-26 14:16:01 -05:00
Bert Owen bc0e3ba0eb VRFS-1681 cleanup unused notation files 2014-05-26 01:30:10 +08:00
Scott Comer 81495315f7 simplify Search.new_musicians api 2014-05-22 21:42:07 -05:00
Brian Smith 0e419a7881 VRFS-1692 cancel RSVP complete 2014-05-22 00:40:17 -04:00
Scott Comer 94421c03c0 merge conflict with db/manifest resolved 2014-05-21 21:33:38 -05:00
Scott Comer 09231c5fe6 fix for vrfs-1476 - scoring should store the detail data 2014-05-21 21:30:43 -05:00
Jonathan Kolyer 836baee962 merging with develop 2014-05-21 21:55:26 +00:00
Brian Smith 25f325d720 VRFS-1690 create RSVP request working 2014-05-21 17:47:11 -04:00
Scott Comer 4a76e0c983 get_work has a larger radius and excludes the current connections address 2014-05-21 14:05:45 -05:00
Jonathan Kolyer 3fd7805b1d VRFS-736 removed pending send email tests 2014-05-21 07:30:20 +00:00
Jonathan Kolyer 9ad0badff1 VRFS-736 filling out remaining subtypes 2014-05-21 06:20:15 +00:00
Jonathan Kolyer b998b87a01 VRFS-736 refactoring 2014-05-21 06:06:16 +00:00
Jonathan Kolyer 70f34120b3 VRFS-736 refactoring 2014-05-21 05:24:52 +00:00
Brian Smith f793b14879 VRFS-1738 more RSVP API work 2014-05-21 00:57:32 -04:00
Scott Comer 3e0667e24d added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api 2014-05-20 09:46:45 -05:00
Brian Smith 96f62b1364 VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work 2014-05-20 02:45:00 -04:00
Jonathan Kolyer f53ca0010d VRFS-736 looping through results 2014-05-20 05:58:06 +00:00
Jonathan Kolyer cd801d7852 VRFS-736 fixing progression email algorithm and tests 2014-05-20 05:21:11 +00:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Bert Owen 97843035ba Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-19 23:36:23 +08:00
Bert Owen cdc9d121cb VRFS-1674 Create Session API 2014-05-19 23:35:38 +08:00
Jonathan Kolyer 4ddd699302 VRFS-736 filling out progression steps 2014-05-19 04:35:25 +00:00
Jonathan Kolyer 30f2387658 VRFS-736 2014-05-19 03:23:14 +00:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Jonathan Kolyer f6196bb2c8 VRFS-736 consolidating query 2014-05-19 00:43:37 +00:00
Brian Smith 95100a1b49 VRFS-1668 added some edge case tests for new notifications (still need sunny day tests) 2014-05-18 14:59:57 -04:00
Jonathan Kolyer 1271b74bc4 VRFS-736 passing tests 2014-05-18 06:14:19 +00:00
Jonathan Kolyer fbb86dd9e7 VRFS-736 tests passing and what-not 2014-05-18 05:24:07 +00:00
Jonathan Kolyer 6e7562ffc8 VRFS-736 progression emails first pass 2014-05-18 00:12:01 +00:00
Scott Comer 9eaa34b07f disable lat lng and distance in queries for users 2014-05-17 14:55:26 -05:00
Jonathan Kolyer 72110cb057 Merge branch 'develop' into vrfs1664 2014-05-17 17:43:35 +00:00
Jonathan Kolyer c51d7de5f4 VRFS-1664 some tweaks 2014-05-17 17:38:42 +00:00
Jonathan Kolyer 7428a2f26b VRFS-1664 new musician weekly email 2014-05-16 07:58:06 +00:00
Bert Owen 24117c1b67 VRFS-1718 added MusicNotation model, migration 2014-05-15 23:49:06 +08:00
Seth Call a19d6dcc07 * adding RsvpRequest and RsvpSlot models 2014-05-14 15:48:42 -05:00
Scott Comer 00e177311d tests for last jam location setting and some cleanup of user manager and user location spec 2014-05-13 14:56:58 -05: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 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
Seth Call 9700fff691 * fixing some SQL in conn manager for querying active_music_sessions 2014-05-06 18:02:00 -05: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 5f74bce061 VRFS-1577 2014-05-06 06:41:10 +00:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Scott Comer 5cc515d615 a small cleanup of connection fields and fix broken tests 2014-05-02 13:44:29 -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
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
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