Commit Graph

411 Commits

Author SHA1 Message Date
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
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 00a6139cd1 * merged 2014-04-29 14:04:26 +00:00
Scott Comer e82ae132bd fix method for adding connection to music session 2014-04-28 22:38:30 -05:00
Jonathan Kolyer c66f5879cf VRFS-1576 fixed referrals_by_date to support pagination 2014-04-23 02:43:13 +00:00
Jonathan Kolyer b232344336 VRFS-1576 added referrals_by_date and associated test 2014-04-22 07:12:05 +00:00
Jonathan Kolyer 62dbeaa818 VRFS-1576 added validation and tests 2014-04-20 23:20:27 +00:00
Jonathan Kolyer 245727806d VRFS-1576 affiliate_partner model 2014-04-20 22:55:40 +00:00
Seth Call ac1b5d2e42 * fix for timecop 2014-04-15 17:02:51 +00:00
Jonathan Kolyer bf1e315b48 Merge branch 'develop' into vrfs925 2014-04-14 10:59:58 +00:00
Jonathan Kolyer 9ddbc6ba5c VRFS-925 finishing up tests 2014-04-14 10:57:21 +00:00
Seth Call 76e63193ca * fixing some broken tests 2014-04-09 21:11:13 +00:00
Jonathan Kolyer 5a4bff14d2 VRFS-925 running tests for server side GA events 2014-04-08 17:15:49 +00:00
Jonathan Kolyer 7203124e89 merging 2014-04-08 07:21:50 +00:00
Seth Call 90eb0bc081 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-02 00:43:10 +01:00
Seth Call 7bfe1cb634 * VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
2014-04-02 00:38:36 +01:00
Jonathan Kolyer accaa99e38 VRFS-1483 integrating opt-out; fixing tests 2014-04-01 14:42:26 +00:00
Anthony Davis c7ff47dabf Fixing failing test 2014-03-27 22:23:39 -05:00
Seth Call d6210c0b2f * VRFS-1474 - link in friend invite 2014-03-25 15:29:08 +00:00
Seth Call 7cdd47ac89 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-20 11:53:35 +00:00
Seth Call b04c7bcea5 * VRFS-871 - user-to-user messaging complete 2014-03-20 11:53:26 +00:00
Jonathan Kolyer e29907f09b merging 2014-03-19 18:44:35 +00:00
Jonathan Kolyer c6c12e7b9e Merge branch 'develop' into vrfs1483 2014-03-19 00:23:32 +00:00
Jonathan Kolyer 98a4553f72 VRFS-1483 specs for test users 2014-03-18 18:33:48 +00:00
Jonathan Kolyer 3204de01e6 VRFS-1483 merge 2014-03-18 15:13:03 +00:00
Jonathan Kolyer e6d0851391 VRFS-1483 adding first set of updates for batch emails 2014-03-18 15:07:45 +00:00
Scott Comer 91d76c7f12 marking broken location tests as pending; marked broken icecast config tests as pending; disabled some silly and now useless debugging output in get_work 2014-03-17 12:21:32 -05:00
Seth Call b783d270b1 * VRFS-1457 - resolved two issues; invited users will be able to invite, and the error path will show errors 2014-03-15 16:47:21 +00:00
Seth Call 030d31eadc supply link on facebook share - VRFS-1376 2014-03-10 16:24:36 +00:00
Jonathan Kolyer d63f090657 VRFS-925 merge conflict 2014-03-10 09:01:33 +00:00
Jonathan Kolyer 6ba8256d1a VRFS-925 fixed typo for testing 2014-03-10 08:58:03 +00:00
Seth Call b9ee475db5 * working on event page 2014-03-10 06:31:20 +00:00
Seth Call 3c5a14312a * Event page 'chrome' is setup and pulling from database--now to add band logic 2014-03-09 22:58:57 +00:00
Jonathan Kolyer 3b2c3ea755 VRFS-925 merge conflict 2014-03-09 13:42:53 +00:00
Jonathan Kolyer 2b11cb7abb VRFS-925 ga event processing 2014-03-09 13:38:46 +00:00
Scott Comer c1bea4ae03 merge conflict 2014-03-09 01:28:41 -06:00
Scott Comer f8e06c476d fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions. 2014-03-09 00:22:51 -06:00
Jonathan Kolyer 713344a7a7 merge conflict 2014-03-08 20:50:51 +00:00
Seth Call faed48271b * VRFS-1372 resolved, and not requiring local only until figure out some deployment issues 2014-03-07 14:20:34 -06:00
Jonathan Kolyer eb98b97cd5 merge conflict 2014-03-07 06:53:35 +00:00
Seth Call 4f626cc644 * VRFS-900 check for no tracks when you land directly on session screen, and if you find session 2014-03-06 12:17:47 -06:00
Seth Call 0d27a47b42 * VRFS-1308 - make configure tracks be cool about no selected items when the user indicates they might want to configure them. fix some recording styling button issues 2014-03-06 11:02:50 -06:00
Scott Comer b54e7d1ca1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-05 20:30:54 -06:00
Scott Comer 65b0c7115a first take on api_music_sessions_controller#index replacement, nindex. 2014-03-05 20:30:40 -06:00
Seth Call 1c2585ba92 * VRFS-1047 mosttly done, aside from jamfet link 2014-03-05 17:18:53 -06:00
Jonathan Kolyer 1eb4b80482 VRFS-1333 refactoring {recording,music_sessions_history}_plays into playable_plays 2014-03-05 06:40:04 +00:00
Scott Comer 057a2b79dd removed updating with with connection location attributes 2014-03-04 18:48:29 -06:00
Seth Call 3c4f5c7e55 * merged 2014-03-03 16:18:03 -06:00
Seth Call 7ab7bfd795 * VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state 2014-03-03 16:13:23 -06:00
Scott Comer 6ee68e8943 fix the login test for locidispid and add a test for reconnect 2014-03-03 14:54:07 -06:00
Scott Comer ab1143c9a8 fix and test user updates upon login 2014-03-03 14:31:25 -06:00
Scott Comer 1e8d2bb724 update user with connection address on login or reconnect; make the better test data useable; fix up tests for geo stuff 2014-03-02 23:16:48 -06:00
Scott Comer fd42fc56fe wire up get_work 2014-02-27 10:42:47 -06:00
Scott Comer 2163e0172f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 06:17:58 -06:00