seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,840 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

842 Commits

Author SHA1 Message Date
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 8eb7430d9a One more stray puts. 2015-01-03 11:47:28 -06:00
Seth Call 82b7c005ec * if promos is selected, then change text to 'Selected Sessions and Recordings' VRFS-2591 2015-01-02 11:18:39 -06:00
Seth Call 5758096f33 * fix bug in connection stats 2015-01-01 21:45:07 -06:00
Jonathan Kolyer 559d2d720d VRFS-2552 update query to include users started scheduled sessions not yet finished 2015-01-01 19:29:18 +00:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -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 7ca3acb676 * wip 2014-12-22 09:50:59 -06:00
Seth Call 9876c00a7a * VRFS-2456 - add listen function to find session page, and update of join/rsvp icons 2014-12-19 14:00:49 -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 8ac9d19e73 VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool). 2014-12-15 18:02:51 -06:00
Steven Miers ac2daed4da VRFS-2481 : Jam Tracks python layer and source. 2014-12-15 12:16:19 -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
Jonathan Kolyer 93672844f2 VRFS-2529 remove quick-start scheduled sessions from account tab 2014-12-08 06:26:06 +00:00
Brian Smith 937695e829 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-07 21:35:36 -05:00
Brian Smith 605bdbcbf6 VRFS-2463 added tests for excluding currently viewed sessions/recordings 2014-12-07 21:35:30 -05:00
Seth Call 53ce955838 * VRFS-2530 - denormalize online for performance reasons 2014-12-07 16:04:10 -06:00
Steven Miers 207b7b9e20 VRFS-1890 : Mechanism to move track up/down, hook up in admin UI. 2014-12-06 14:04:31 -06:00
Brian Smith 354f6320fc VRFS-2463 (1) prevent duplicate claimed recordings from showing in sidebar, (2) only show public recordings and sessions with fan_access=true, (3) exclude recording / session being shown on landing page in the sidebar 2014-12-06 09:34:30 -05: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
Jonathan Kolyer 868ca0b476 VRFS-1442 sessions band selection 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 9bdddc22ff VRFS-1442 band deletion; band member layout; invitations; band admin support 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 465fd6fa94 VRFS-1442 prepend users bands to band search results 2014-12-03 08:22:34 +00:00
Seth Call 589a2f6cc6 * VRFS-2520 - recordings can be cleaned up now 2014-12-02 17:13:34 -06:00
Steven Miers 41096f08ad VRFS-2480: Additional back-end and UI functionality required for checking out. 2014-12-01 18:45:41 -06:00
Seth Call 6ad844035d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-21 17:16:21 -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
Brian Smith f0b60f28e4 VRFS-2467 dedup users and instruments on session hover bubble 2014-11-21 01:20:27 -05:00
Seth Call 76adc44a50 * wip 2014-11-17 17:16:30 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Brian Smith d65358cea6 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 13:01:28 -05:00
Brian Smith 118ed7c39c undo last change re: other instrument id 2014-11-15 11:59:51 -05:00
Brian Smith 12ca12f3cf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 11:33:43 -05:00
Brian Smith 8707bb2f16 set instrument ID for unstructured rsvp 2014-11-15 11:33:26 -05:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Seth Call 6277708bb4 VRFS-1491 - create personal/master mix toggle, and beef up user.mods 2014-11-11 16:21:46 -06:00
Seth Call c3cd742c17 * wip 2014-11-11 16:21:29 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Seth Call 4e00863de6 * merged 2014-11-07 16:16:25 -06:00
Seth Call 8cad33a303 * recording file/manager fixes and aging of recordings 2014-11-07 16:12:36 -06:00
Brian Smith c6bfd59999 VRFS-2462 fixed session count on musician hover bubble 2014-11-07 13:05:07 -05:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:28:28 -06:00
Seth Call 4f9bdb2c5c * VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state 2014-11-03 15:24:46 -06:00