7a2dd6ea0b
VRFS-3459 merging develop
2015-10-19 19:58:41 +00:00
Seth Call
58b8a29f51
* VRFS-3630 - jamtrack landing page revamp
...
* VRFS-3637 - jamtrack landing tile updated
* VRFS-3638 - jamtrack web player
2015-10-16 14:01:18 -05:00
0c25d0e40b
merging develop
2015-10-05 14:06:39 +00:00
Seth Call
cb76a6e28f
* VRFS-3588 generating AAC's for master previews
2015-09-29 19:57:31 -05:00
Seth Call
4a647b8bd1
* VRFS-3519 - client and server jamtrack mixdown support
2015-09-21 20:01:39 -05:00
5c0178df8f
VRFS-3393 jam_track has_many genres support
2015-09-21 01:00:37 +00:00
Seth Call
468b0c4998
* adding guess code and fixing importer
2015-09-20 15:14:45 -05:00
Seth Call
e7b50ca4a8
* VRFS-3449 - updates for direct landing pages
2015-08-20 14:19:07 -05:00
Seth Call
37d6c3e57c
* add csv to dump released JamTracks
2015-08-18 15:19:40 -05:00
Seth Call
f6101f3621
VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing
2015-08-18 14:26:41 -05:00
Seth Call
c4981376ac
* set storage format for sync_all_dev
2015-08-13 11:13:13 -05:00
aa36b2f215
merging develop
2015-08-04 13:44:47 +00:00
Seth Call
557e19e5e7
* allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386)
2015-08-09 13:37:43 -05:00
3eca6aeee5
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-06-04 05:59:31 +00:00
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
da58ac6eab
merging
2015-05-22 08:20:07 +00:00
d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
737367b016
VRFS-3036 building out band search filter features, refactoring musician search filter
2015-05-18 04:00:12 +00:00
Seth Call
0264c539b1
*hardcoding https where http is found
2015-05-15 18:25:47 -05:00
11f60b71e4
VRFS-3242 : Schema and model changes required for band profile functionality.
...
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
2015-05-13 21:06:14 -05:00
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
Seth Call
62b6820e90
* VRFS-3220 - estimate taxes manually
2015-05-09 08:30:12 -05:00
Seth Call
96df8cbfea
* disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task)
2015-05-05 11:44:28 -05:00
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
a9ab5bb730
Merge video_ui branch into develop.
2015-04-21 13:47:00 -05:00
Seth Call
9480aadaae
Conflicts:
...
ruby/lib/jam_ruby/models/jam_track_track.rb
2015-04-20 13:55:33 -05:00
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
1f432446f5
VRFS-2795 fixing results display; generating same data
2015-04-04 02:54:58 +00:00
Seth Call
d3cc9fa6af
* download master command
2015-04-01 20:35:23 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
df60a43404
* adding gear dump
2015-02-09 18:07:49 -06:00
Seth Call
96bc9487c4
* merged
2015-01-29 16:13:40 -06:00
Seth Call
f53c5c9612
*wip
2015-01-26 21:22:44 -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
99f5e46ff6
* another quick fix for broken databasecleaner transaction cleanup
2015-01-07 16:57:25 -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
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
Seth Call
b780b4a462
* merged
2014-11-17 13:32:13 -06:00
Seth Call
3fc0329e79
* wip
2014-11-13 09:20:08 -06:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
Seth Call
0c3a43a177
* wip
2014-08-18 10:37:55 -05:00
Seth Call
699e8a6c5d
* check for empty file for VRFS-1988
2014-07-30 15:44:46 -05:00
Seth Call
00993acfed
* VRFS-1988 set up infra to allow for scheduler.yml override file
2014-07-30 15:35:56 -05:00
Seth Call
2f76a82bd3
* fix changes to resque-scheduler includes
2014-07-27 12:46:20 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
Seth Call
c2a5936720
* wip
2014-07-14 15:53:04 -05:00
Jonathan Kolyer
Seth Call
Steven Miers