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,774 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

1088 Commits

Author SHA1 Message Date
Seth Call 8a84ff5609 * fix broken tests because of removal of diagnostics, and fix bad logging pattern 2014-12-31 23:17:47 -06:00
Seth Call 71399dcaa7 * fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting 2014-12-31 20:39:22 -06:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -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 3bac8252e9 * fixing websocket tests 2014-12-18 16:26:56 -06:00
Seth Call d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Jonathan Kolyer f193ca2f42 VRFS-2529 added create type for session creation 2014-12-08 06:31:45 +00: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
Seth Call 34f0aff328 * build poke 2014-12-06 15:47:20 -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 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 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
Seth Call d1d059b4c5 * disable score_histories for now 2014-11-17 13:28:43 -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
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
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
Seth Call ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -06:00
Brian Smith 0007930936 VRFS-2401 revert to inline styles for email links for now, need to revisit better solution 2014-11-02 16:43:56 -05:00
Brian Smith 33a431f822 VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05:00
Seth Call 5f8953011c * VRFS-2439 fix spurious -i argument in normalize-ogg and mp3 command 2014-11-01 21:21:42 -05:00
Seth Call f0d675c10d * fix typo in exist check 2014-11-01 21:10:12 -05:00
Brian Smith a310c46288 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-29 20:41:05 -04:00