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
Seth Call 36b4179492 * VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only) 2015-03-20 17:26:56 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Brian Smith c91fd0cb0e merge develop 2015-03-17 03:10:22 -04:00
Jonathan Kolyer 188274cbb5 merging feature/cohort_data with develop 2015-03-17 05:33:01 +00:00
Seth Call ab72438a3f * VRFS-2932 - make preview apply to all jam track tracks 2015-03-16 17:50:38 -05:00
Seth Call 9dd3984d07 * VRFS-2936 - ugly button for Peter testing 2015-03-16 13:36:02 -05:00
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Jonathan Kolyer 420c00e3b5 VRFS-2916 fixed monthly queries 2015-03-16 06:03:36 +00:00
Brian Smith b91bc09817 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-15 11:09:21 -04:00
Jonathan Kolyer caddee4f57 merging develop 2015-03-14 18:41:22 +00:00
Jonathan Kolyer 961af94e6c VRFS-2795 cohorts first pass 2015-03-14 18:39:07 +00:00
Jonathan Kolyer b38370589f VRFS-2916 cohort model/table 2015-03-13 07:10:39 +00:00
Seth Call 7c73e2ab5c * VRFS-2922 - show spinner for pending metronome 2015-03-12 21:53:23 -05:00
Brian Smith 948174f19a VRFS-2701 musical experience bug fix 2015-03-12 21:34:20 -04:00
Seth Call f9e02c5707 Merge branch 'develop' into feature/jam_track_ui_2 
Conflicts:
	admin/app/admin/jam_tracks.rb
	admin/app/views/admin/jam_tracks/_form.html.slim
	admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
	admin/config/initializers/jam_tracks.rb
	db/manifest
	ruby/lib/jam_ruby.rb
	ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
	ruby/lib/jam_ruby/jam_tracks_manager.rb
	ruby/lib/jam_ruby/models/jam_track.rb
	ruby/lib/jam_ruby/models/jam_track_right.rb
	ruby/lib/jam_ruby/models/jam_track_track.rb
	ruby/spec/jam_ruby/models/jam_track_right_spec.rb
	ruby/spec/jam_ruby/models/jam_track_track_spec.rb
	ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
	web/app/assets/javascripts/download_jamtrack.js.coffee
	web/app/assets/javascripts/globals.js
	web/app/assets/javascripts/jam_rest.js
	web/app/assets/javascripts/order.js
	web/app/assets/javascripts/playbackControls.js
	web/app/assets/javascripts/session.js
	web/app/assets/stylesheets/client/session.css.scss
	web/app/controllers/api_jam_tracks_controller.rb
	web/app/controllers/api_recurly_controller.rb
	web/spec/controllers/api_jam_tracks_controller_spec.rb
 2015-03-12 08:51:52 -05:00
Seth Call f2b453ea19 * VRFS-2917 - shopping cart can be anonymous 2015-03-11 20:55:11 -05:00
Seth Call 5fa37abfb3 * VRFS-2916 - adding redeemed boolean 2015-03-11 17:02:03 -05:00
Seth Call 9279d88d8d * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
Jonathan Kolyer b998d28c37 VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-10 04:33:37 +00:00
Brian Smith d865d0a1fa Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-09 20:25:28 -04:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Jonathan Kolyer 3810aecb00 merging feature/musician_profile_enhancements 2015-03-06 05:12:13 +00:00
Brian Smith e658e6f4b5 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-05 02:18:55 -05:00
Steven Miers 2004d48fa1 Merge 2015-03-04 16:03:28 -06:00
Jonathan Kolyer d95279e694 VRFS-2795 merging feature/musician_profile_enhancements 2015-02-28 20:18:56 +00:00
Jonathan Kolyer 2ca3ec6d91 VRFS-2795 merging feature/musician_profile_enhancements 2015-02-28 20:17:16 +00:00
Brian Smith 4d133e0043 merge develop 2015-02-28 02:24:23 -05:00
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -06:00
Seth Call 9415593244 * merged 2015-02-27 08:41:49 -06:00
Seth Call 8205b5ea58 * VRFS-2841 - load jmep into the backend 2015-02-27 08:37:12 -06:00
Brian Smith 4f9d440f7d merge develop 2015-02-26 22:36:21 -05:00
Brian Smith 80e942d69e VRFS-2701 wip musician profile enhancements 2015-02-26 22:33:53 -05:00
Steven Miers 2823645a60 Merge with develop & fix manifest. 2015-02-26 17:49:10 -06:00
Seth Call 3abe9108cd * fix typo 2015-02-26 10:04:59 -06:00
Seth Call 671151b460 * VRFS-2804 - widen authorization token 2015-02-26 10:00:21 -06:00
Brian Smith 0c599ca023 Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-25 21:55:57 -05:00
Steven Miers ef287187ba VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates. 2015-02-25 17:19:03 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Seth Call 947d649f5f * VRFS-2831 - metronome showing 2015-02-24 17:16:12 -06:00
Jonathan Kolyer 2ea1259060 merging feature/musician_profile_enhancements 2015-02-24 06:08:33 +00:00
Seth Call 9dbf1a3e56 * VRFS-2634 adding version to jamtrack 2015-02-23 09:12:34 -06:00
Jonathan Kolyer 0f756ba17e VRFS-2795 json_store table 2015-02-23 06:25:04 +00:00
Brian Smith 500af2bc05 merge develop (had lots of migration issues) 2015-02-20 08:35:59 -05:00
Seth Call 39415cdf22 * remove BPM from jam_tracks 2015-02-17 10:41:49 -06:00
Seth Call 51689e3d61 * make backing tracks show on/off and fix migration 2015-02-16 14:59:58 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Seth Call 503e46ed74 *wip 2015-02-15 21:52:28 -06:00
Brian Smith a09894b974 VRFS-2692 add genre_type to genre_players table 2015-02-13 22:27:12 -05:00
Brian Smith 28ff54b000 VRFS-2695 wip new profile API 2015-02-13 03:16:48 -05:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
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