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

405 Commits

Author SHA1 Message Date
Seth Call e28db48e94 * resolving VRFS-2624 - if nil recording_ids, just exit early 2015-01-08 10:25:54 -06:00
Seth Call 3fb5ab89d9 * typo in user wipe to fix test 2015-01-07 18:24:48 -06:00
Seth Call ef03b8886a * missed merge conflict 2015-01-07 17:45:47 -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
Seth Call 99f5e46ff6 * another quick fix for broken databasecleaner transaction cleanup 2015-01-07 16:57:25 -06:00
Seth Call d58cf2a048 * VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API) 2015-01-07 16:16:57 -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 eb26c33858 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-05 20:26:42 -06:00
Seth Call 4e6ca425d9 * trying to fix tests 2015-01-05 20:26:36 -06:00
Steven Miers 02aef2fe17 Fix test failures for jam_track rights. 2015-01-05 19:02:48 -06:00
Seth Call 6906e4454a * VRFS-2601 - REST API to return keys 2015-01-05 16:53:43 -06:00
Seth Call aabbd90b02 * VRFS-2602 change jka to jkz 2015-01-05 14:39:55 -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
Seth Call 5758096f33 * fix bug in connection stats 2015-01-01 21:45:07 -06:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -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 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 6407d2f22a Merge from working branch 2014-12-15 12:16:19 -06:00
Jonathan Kolyer f193ca2f42 VRFS-2529 added create type for session creation 2014-12-08 06:31:45 +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
Seth Call e0688ac6f1 * VRFS-2520 - recordings can be cleaned up now 2014-12-02 17:13:47 -06:00
Seth Call 589a2f6cc6 * VRFS-2520 - recordings can be cleaned up now 2014-12-02 17:13:34 -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
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
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
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05:00
Brian Smith 300bc2cd82 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-27 21:37:28 -04:00
Seth Call fb36b8e380 * VRFS-2408 - remove dup tracks from interfrace 2014-10-27 17:14:40 -05:00
Brian Smith c57ea372ac VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots 2014-10-25 22:23:52 -04: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
Steven Miers c1f2a2083f VRFS-2029 : Update REST API ApiRecordingsController#claim 
to accept and distribute upload_to_youtube flag as appropriate.  Spec
to verify.
 2014-10-15 13:54:10 -05:00
Brian Smith 3641521740 VRFS-2244 handle duplicate friend requests better 2014-10-14 02:12:33 -04:00
Jonathan Kolyer 649027cda7 VRFS-2282 tests and music session time queries 2014-10-14 03:54:58 +00:00
Jonathan Kolyer 26b124dde8 VRFS-2282 first pass purging stale sessions 2014-10-12 07:49:31 +00:00
Steven Miers 4d08359ef1 Fixes VRFS-2334 : re-add filter for users 
Includes spec to reproduce, and additional specs that uncovered a
problem with setting the client_video_source_id.
 2014-10-10 11:07:36 -05:00
Brian Smith d08475c34e VRFS-2321 comment out session join email notification 2014-10-08 20:27:28 -04:00
Steven Miers 9473ffa352 Merge branch 'feature/video_mvp' into develop 2014-10-07 17:37:06 -05:00
Steven Miers e26c254d36 VRFS-2028 : Tests for verifying both types are there and have expected attributes in the hash. 
I.E., type is “recorded_track” or “recorded_video” as appropriate, and
videos have client_video_source_id attribute.  Also test pagination.
 2014-10-07 15:36:16 -05:00
Steven Miers 160108a217 Merge video_mvp branch 2014-10-07 11:33:34 -05:00