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

1019 Commits

Author SHA1 Message Date
Seth Call e40c964d97 * merged 2015-02-15 22:15:34 -06:00
Seth Call afe9f65709 * merged 2015-02-15 22:14:30 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Seth Call 3563e6e08a * VRFS-2747 - incorporating welcome message from David; made headers white 2015-02-06 17:07:18 -06: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 96bc9487c4 * merged 2015-01-29 16:13:40 -06:00
Steven Miers 33177ddae6 Merge with develop. 2015-01-29 10:55:10 -06:00
Steven Miers 5ed67cc8f6 VRFS-2667, VRFS-2668 : Fix broken spec. 2015-01-29 09:50:13 -06:00
Brian Smith 5a2fbab21c VRFS-2689 user model changes for musician profile enhancements 2015-01-29 00:45:47 -05:00
Steven Miers 63574f5a25 VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests. 2015-01-28 19:22:36 -06: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
Steven Miers 6f8113b374 Merge branch 'develop' into feature/backing_tracks 2015-01-26 12:11:57 -06:00
Seth Call 65f1f0fe79 * VRFS-2640 - double-check if jobs are concurrent safe 2015-01-23 14:50:09 -06:00
Brian Smith 3f2be132bd VRFS-2539 protect against error during notification load if the related session is missing / clean up the notifications of nonexistent sessions 2015-01-21 22:40:31 -05:00
Steven Miers c70a5ee2bb Merge branch 'develop' into feature/backing_tracks 2015-01-21 14:16:04 -06:00
Brian Smith f80b0e4f66 VRFS-2193 show only active musicians in each feed item detail view for in-progress sessions 2015-01-20 02:21:25 -05:00
Steven Miers fe64995f54 Merge branch 'develop' into feature/backing_tracks 2015-01-19 17:10:28 -06:00
Steven Miers cefce67e89 Merge branch 'develop' into feature/backing_tracks 2015-01-19 15:21:13 -06:00
Seth Call 8f9e49ccf1 * VRFS-2660 - fixing dead links in welcome email and some corp pages 2015-01-19 15:07:52 -06:00
Seth Call f8b3d8cc7d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-19 10:25:53 -06:00
Seth Call c5af644a38 * do not accept latency above 10000ms on user model 2015-01-16 17:20:07 -06:00
Brian Smith 2017fed9ce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-12 22:37:28 -05:00
Brian Smith 54d0f36319 VRFS-2465 use new table for text messages 2015-01-12 22:37:07 -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
Seth Call 5b17c50f83 * make reconnect messages warn 2015-01-12 14:10:26 -06:00
Steven Miers babd9d7d90 VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify. 2015-01-12 12:41:44 -06:00
Brian Smith 73e8f9ac6f VRFS-2465 wip text message changes 2015-01-12 01:26:27 -05:00
Brian Smith 21f25e51d0 VRFS-1985 VRFS-2252 added tests 2015-01-12 01:20:19 -05:00
Seth Call d139966445 VRFS-2643 - run eventmachine in it's own thread 2015-01-11 16:41:49 -06:00
Seth Call 2c8a4b8483 * VRFS-2642 - reconnect at start of each job 2015-01-11 15:43:42 -06:00
Steven Miers d0c0c6d01e VRFS-2498, VRFS-2499 : Validations. 2015-01-11 14:15:47 -06:00
Seth Call e8ffb9c27d Merge branch 'develop' into feature/session_jamtracks 2015-01-09 11:24:03 -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 cc3bf2ce1f * wip 2015-01-08 20:35:39 -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 e28db48e94 * resolving VRFS-2624 - if nil recording_ids, just exit early 2015-01-08 10:25:54 -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 d58cf2a048 * VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API) 2015-01-07 16:16:57 -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 405c155c71 * VRFS-2606 get offset time into MM:SS:MLS format 2015-01-07 11:07:26 -06:00
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Brian Smith 67b1132d24 VRFS-2554 fixed notification for scheduled session with TBD date/time 2015-01-06 21:20:41 -05:00
Seth Call af83a4f6a1 * VRFS-2608 - refactor and slight cleanup of UI towards new spec 2015-01-06 16:51:19 -06:00
Seth Call 1cb9f47f6c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-06 09:41:53 -06:00
Seth Call 7df0258015 * VRFS-2600 - tracks saved as id.ext to expose metadata 2015-01-06 09:36:05 -06:00
Steven Miers 18d06096b5 Revert "Fix spec that was magically passing sporadically." 
This reverts commit 4cc70f2082.
 2015-01-05 19:04:08 -06:00
Steven Miers f677714e9a Revert change. 2015-01-05 19:03:28 -06:00
Steven Miers eb990dd930 One more foxy 2015-01-05 18:27:14 -06:00
Steven Miers 4cc70f2082 Fix spec that was magically passing sporadically. 2015-01-05 17:47:27 -06:00