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

438 Commits

Author SHA1 Message Date
Brian Smith 33aef8a380 VRFS-2694 user presence model 2015-02-05 03:34:25 -05:00
Seth Call ac1271634d * VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip) 2015-01-31 15:20:48 -06:00
Seth Call 7352fa9b19 * VRFS-2613 - optimizing hourly cleanup by moving it to the score report routine 2015-01-30 10:46:02 -06:00
Seth Call 96bc9487c4 * merged 2015-01-29 16:13:40 -06:00
Steven Miers 33177ddae6 Merge with develop. 2015-01-29 10:55:10 -06:00
Brian Smith 5a2fbab21c VRFS-2689 user model changes for musician profile enhancements 2015-01-29 00:45:47 -05:00
Steven Miers d7fc313d5f VRFS-2665, VRFS-2666 : Create models and relationships for two new tables: backing_tracks and recorded_backing_tracks 2015-01-28 19:22:36 -06:00
Brian Smith b0bf4b4a48 VRFS-2465 added script to migrate text messages in notifications table to the new text_messages table 2015-01-12 22:53:55 -05:00
Steven Miers c6f03a91b8 VRFS-2498, VRFS-2618 More coherent data model and logic for backing tracks and metronome re: active_music_session_spec. 2015-01-12 17:44:20 -06:00
Brian Smith 21f25e51d0 VRFS-1985 VRFS-2252 added tests 2015-01-12 01:20:19 -05:00
Steven Miers d0c0c6d01e VRFS-2498, VRFS-2499 : Validations. 2015-01-11 14:15:47 -06:00
Steven Miers f6111516fd VRFS-2499 : Metronome schema changes. 2015-01-11 13:42:42 -06:00
Steven Miers 0c1abfba22 VRFS-2499 : Schema changes for backing tracks. 2015-01-11 13:05:55 -06:00
Seth Call 2c798e8860 * VRFS-2629 - one can follow the progression of a jam track being signed with detail 2015-01-09 11:23:20 -06:00
Seth Call b5c446dd04 * VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks 2015-01-08 11:38:46 -06:00
Seth Call e9e9962c42 Conflicts: 
db/manifest
	ruby/spec/jam_ruby/models/email_batch_spec.rb
 2015-01-07 17:44:56 -06:00
Steven Miers 3028e421fb VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false. 
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
 2015-01-07 12:33:49 -06:00
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Seth Call d677b43c28 * VRFS-2603 private key now stored 2015-01-05 15:19:20 -06:00
Seth Call aed848c507 Merge branch 'develop' into feature/jam_tracks 
Conflicts:
	db/manifest
	pb/src/client_container.proto
	ruby/lib/jam_ruby.rb
	web/config/environments/development.rb
	web/config/environments/test.rb
 2015-01-04 09:31:33 -06:00
Steven Miers bbee617c4b VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec. 2014-12-22 14:23:05 -06:00
Seth Call aa1706f8ac * adding diagnostic/user index 2014-12-22 09:53:49 -06:00
Seth Call 06906189d9 * VRFS-2229, VRFS-2523 broadcast fixes 2014-12-18 15:15:51 -06:00
Seth Call 01808e6dac * VRFS-2523 - broadcast fixes 2014-12-18 15:14:23 -06:00
Seth Call d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Steven Miers 34cb617f5f VRFS-1960 : download API for JamTracks, including a new message type, rescue job that builds the JKZ, and specs that exercise it all. 2014-12-17 17:19:36 -06:00
Steven Miers 795cb6f536 Dedicated spec for testing cleaner. Some cleanup/renaming. 2014-12-15 23:57:57 -06:00
Steven Miers ff42a84598 VRFS-2482 : Jam Tracks cleanup and initial spec. 2014-12-15 20:30:46 -06:00
Steven Miers 361d88a0fa VRFS-1959 : jam_tracks#list_downloads API and model methods, as well as associated tests to verify. 2014-12-15 19:21:27 -06:00
Steven Miers f6fef00ea5 VRFS-1952 : Schema changes for proper type and incremental code changes. WIP. 2014-12-15 12:16:19 -06:00
Seth Call 2c6eab206e * change approach to updating connections 2014-12-07 22:31:06 -06:00
Seth Call 53ce955838 * VRFS-2530 - denormalize online for performance reasons 2014-12-07 16:04:10 -06:00
Steven Miers 8634d4f726 VRFS-1959 : change the primary key (id) to be a big int and to share the sequence used by mixes.id and recorded_tracks.id 
Also modify references as necessary, both from other tables and various
code usages.
 2014-12-06 19:55:59 -06:00
Jonathan Kolyer d8057525bf VRFS-2424 refactored band_genres to genre_players 2014-12-05 14:23:14 +00:00
Jonathan Kolyer 9f60327d20 VRFS-2424 added user.genres; refactored band_genres to genre_players; incorporated editing of user genres in profile 2014-12-05 07:50:03 +00:00
Steven Miers b6850ccce4 VRFS-2481 : Cascading deletes for join table. Add s3 URL. 2014-12-03 16:12:47 -06:00
Seth Call eedc5ae970 * VRFS-1491 - finishing up dealing with refactor of monitor vs master tracks 2014-11-21 17:16:00 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Seth Call 8cad33a303 * recording file/manager fixes and aging of recordings 2014-11-07 16:12:36 -06:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Seth Call ea601711fa * make desk keys configurable 2014-11-05 20:32:37 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Seth Call fb36b8e380 * VRFS-2408 - remove dup tracks from interfrace 2014-10-27 17:14:40 -05:00
Seth Call fe7edbba5d * many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181 2014-10-22 23:10:49 -05:00
Jonathan Kolyer af2159fe72 VRFS-1945 added create_type to music_sessions; filtering session search based on create_type 2014-10-21 07:27:26 +00:00
Steven Miers dacd702bd8 VRFS-2029 : Migration/manifest for upload_to_youtube 
On claimed_recordings table.
 2014-10-15 13:44:31 -05:00
Jonathan Kolyer aef2b873f2 VRFS-1430 changed db default sender back to noreply; changed text for batch mails to FFFFFF from AAAAAA 2014-10-13 00:51:13 +00:00
Steven Miers 160108a217 Merge video_mvp branch 2014-10-07 11:33:34 -05:00
Brian Smith d4655cd65a renamed file with .sql extension 2014-10-06 19:26:06 -04:00
Seth Call 57ddb86379 * fixing .sql/.rb in manifest 2014-10-06 16:45:14 -05:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Steven Miers dffdb78f71 Merge develop into this branch. 2014-10-06 16:17:36 -05:00
Brian Smith 7856e43f1e VRFS-2219 active sessions should sort to top of Feed 2014-10-06 09:20:31 -04:00
Steven Miers 66feb39de8 VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track. 2014-10-03 14:12:09 -05:00
Steven Miers 5135fe7faf VRFS-2024 - Migration, model and spec for video source. 2014-10-03 13:36:51 -05:00
Jonathan Kolyer 3080a92096 VRFS-1430 merge conflict correction 2014-10-01 22:12:48 +00:00
Jonathan Kolyer 5d524cd7b0 VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98 2014-10-01 22:10:54 +00:00
Seth Call e63369d072 * fix discard scores 2014-10-01 09:32:17 -05:00
Seth Call a75546a5be * fix order of migrations 2014-09-30 16:37:47 -05:00
Seth Call 8889b8ce42 * merge in faster score searches (VRFS-2202) 2014-09-30 10:51:23 -05:00
Brian Smith 6442674c91 VRFS-2216 fix tests; include pending RSVPs and invites for session details screen 2014-09-28 22:37:52 -04:00
Brian Smith 38b336c707 VRFS-2216 fix issue with sms_index function 2014-09-28 11:59:59 -04:00
Brian Smith da771acdaf merge develop 2014-09-25 09:09:44 -04:00
Seth Call 9442e34297 * adding default for connection gateway name 2014-09-24 21:52:07 -05:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Brian Smith 665da60b08 VRFS-2216 include only approved RSVPs / exclude invited users when calculating average session latency 2014-09-23 22:04:17 -04:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call b603d7d253 * VRFS-1505 - fix typo in punk 2014-09-12 06:27:20 -05:00
Brian Smith 32176aa879 VRFS-1505 added new genres to database 2014-09-10 01:03:11 -04:00
Seth Call f0304f2ca3 * VRFS-1981 - delete old scores 2014-08-31 22:24:11 -05:00
Seth Call 6a01a1c2d6 * VRFS-2076, VRFS-2071 - musicians only listed once, and added spinner to find musician page 2014-08-21 14:58:14 -05:00
Seth Call 9d46f07153 * VRFS-2070 - work current_scores into a better query, and update the entire site to use it correctly 2014-08-20 17:06:57 -05:00
Seth Call 0c3a43a177 * wip 2014-08-18 10:37:55 -05:00
Brian Smith 199ef029bc merge develop 2014-08-04 22:38:59 -04:00
Seth Call aa863240b9 * VRFS-1992 finished (daily session email improvements) 2014-08-01 16:17:04 -05:00
Seth Call 9544e3d075 * rename new column because it's not working for reasons I can't understand on the build server 2014-07-30 21:05:59 -05:00
Seth Call a11ae44a90 * VRFS-1951 - make sure staging emails don't get sent from my machie 2014-07-30 16:39:59 -05:00
Brian Smith 6aaddbbe50 VRFS-1478 allow multiple session invites to same user 2014-07-29 20:29:41 -04:00
Seth Call 4ecf7abb1e * VRFS-1978 - state is now autopopulated again 2014-07-29 18:49:36 -05:00
Seth Call 027456105b * VRFS-1968 - locids are now in score history 2014-07-29 18:11:00 -05:00
Seth Call c3461e82a7 * VRFS-1976 - fixed issue where UI always picks 1st scheduled session; VRFS-1962 - use 'full latency' instead of just internet latency in musician search, find session, and new musicians email 2014-07-29 17:52:20 -05:00
Seth Call e9a4f33420 * VRFS-1957 - use median instead of just most recent for current_scores 2014-07-28 17:37:47 -05:00
Seth Call 44ba9ef441 * VRFS-1496 - export CSV 2014-07-27 11:45:46 -05:00
Seth Call 6a037d9987 * VRFS-1944 - user info added to scores and score_histories 2014-07-24 18:39:26 -05:00
Seth Call cc6f3fe974 * VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page 2014-07-23 15:11:02 -05:00
Seth Call 6c4bcd98be * VRFS-1924 - score_history added 2014-07-21 16:42:30 -05:00
Seth Call 513a46067a * merged 2014-07-19 21:12:11 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Seth Call 8441acacef * VRFS-1922 - marking unscheduled sessions as started if activemusicsession is created, and added a migration to fix up old sessions 2014-07-14 16:43:46 -05:00
Seth Call c2a5936720 * wip 2014-07-14 15:53:04 -05:00
Seth Call 0ea1ef49b8 * VRFS-1919 - guard against old clients and new RegisterShutdown callback 2014-07-13 13:20:30 -05:00
Brian Smith 3bc94249ca VRFS-1497 VRFS-1749 added resque job to clean stale sessions, added tests for session scheduler and session cleaner jobs 2014-07-11 02:23:10 -04:00
Brian Smith 8c2842049c fix tests broken in previous commit 2014-07-10 01:12:39 -04:00
Brian Smith 8c320683e2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-10 00:39:54 -04:00
Brian Smith 0041562933 VRFS-1419 VRFS-1906 do not delete music session when canceling because it leaves dangling notifications / added paging support for Find Session screen 2014-07-10 00:39:38 -04:00
Scott Comer 3ebe43ef4b function to produce summary report of scores information 2014-07-09 23:09:38 -05:00
Seth Call 0020a8eb0d * VRFS-1889 completed; VRFS-1879 - partially done 2014-07-08 13:34:03 -05:00
Seth Call b96cc32d3c * VRFS-1858 use open_rsvp instead of music_access for scheduled session 2014-07-04 08:26:46 -05:00
Seth Call 9cb702f9de * VRFS-1858 - fix sessions with no scheduled_start time being filtered 2014-07-03 22:47:11 -05:00
Seth Call 865b488f93 * VRFS-304 - user history (feed) tab 2014-06-27 14:17:56 -05:00
Seth Call 6f2691ee10 * fixing manifest to make staging the authority 2014-06-24 17:40:20 -05:00
Seth Call 6d84241cae * merged 2014-06-23 22:28:23 -05:00
Seth Call 5750584769 * VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works 2014-06-23 22:26:27 -05:00
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
Bert Owen af06127403 fix create session flow, rsvp 2014-06-20 02:43:21 +08:00
Brian Smith b4151c27e9 VRFS-1669 VRFS-1672 session settings dialog / find session work 2014-06-19 00:21:34 -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
Seth Call 5ad6db90ef * VRFS-1684 - approved RSVP'ed users now have scores as well 2014-06-16 18:14:04 -05: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 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 691f0c1a65 first cut at ams_index stored procedure 2014-06-13 10:22:29 -05:00
Brian Smith 5fc9696d01 merge develop 2014-06-11 08:45:34 -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
Brian Smith a9b67a9a6b VRFS-1693 resque job to schedule recurring music sessions 2014-06-03 01:10:25 -04:00
Scott Comer 1d19bf613c removed users isp field, use last_jam_locidispid%1000000 instead; added fields for state and country codes. 2014-06-01 16:03:32 -05:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Brian Smith 7a4ad83cef merge develop 2014-05-29 00:20:09 -04:00
Brian Smith 3078236ef6 add open_rsvps flag to music_sessions table 2014-05-26 12:09:18 -04:00
Scott Comer bf06df36a3 added better regions database; added appropriate indexing for regions table 2014-05-22 15:17:00 -05:00
Scott Comer 5527a6032c geolite region/state codes per country 2014-05-22 08:14:45 -05:00
Bert Owen 00d06fe6f2 * merge 2014-05-22 16:07:17 +08:00
Bert Owen 57f1fab935 VRFS-1677 fixed 2014-05-22 16:02:48 +08:00
Brian Smith 0e419a7881 VRFS-1692 cancel RSVP complete 2014-05-22 00:40:17 -04:00
Brian Smith 176e862338 VRFS-1691 update RSVP request complete 2014-05-21 23:36:34 -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 bbd0c27d23 VRFS-736 cleanup of sess_notrecord text; added progress mailer queue 2014-05-21 22:41:17 +00:00
Jonathan Kolyer 836baee962 merging with develop 2014-05-21 21:55:26 +00:00
Scott Comer 4a76e0c983 get_work has a larger radius and excludes the current connections address 2014-05-21 14:05:45 -05:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Bert Owen cdc9d121cb VRFS-1674 Create Session API 2014-05-19 23:35:38 +08:00
Jonathan Kolyer e44ccc7653 VRFS-736 client_notdl mailer 2014-05-19 15:12:59 +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 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 b393cf35c4 VRFS-1664 STI columns for email batches 2014-05-17 17:42:47 +00:00
Bert Owen 027fd61606 * added recurring_mode to music_session for recurring sessions 2014-05-16 00:19:44 +08:00
Bert Owen 24117c1b67 VRFS-1718 added MusicNotation model, migration 2014-05-15 23:49:06 +08: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
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 9948917f95 * fix promotional data 2014-05-08 08:25:30 -05: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
Seth Call c31c13b07e * adding chat_messages constraint for user_id 2014-05-06 20:04:53 -05:00
Seth Call 7dd1e6c464 * renaming of tables in 2014-05-06 17:50:41 -05:00