Seth Call
dbf4ae777b
* support for drumma boy storage jamtracks
2016-03-13 16:46:09 -05:00
Seth Call
0cd19e6725
* update jmep logic
2016-02-22 20:05:44 -06:00
Seth Call
534b4f0e6c
* duh. backwards logic
2016-02-09 15:17:52 +00:00
Seth Call
0aecf7345f
* code review time\!
2016-02-09 15:17:52 +00:00
fab38451cd
VRFS-3800 go-right receipt validation
2016-02-09 15:17:52 +00:00
8c6d553823
VRFS-3800 ios receipt validation
2016-02-09 15:17:52 +00:00
Seth Call
e446c3ff44
* mark user as teacher better
2016-02-10 21:09:45 -06:00
Seth Call
9e9c2819dd
* update how click track is determined for jamtracks
2016-01-29 17:37:28 -06:00
Seth Call
3243abf837
* started at now set on jamtrack sessions
2016-01-28 06:28:56 -06:00
Seth Call
1869ee021d
* reviews displaying
2016-01-14 15:23:11 -06:00
Seth Call
d62655cbd2
* update resync audio
2015-12-28 05:32:54 -06:00
Seth Call
565544f357
* VRFS-3814 - update jamblaster product page for post-KS
2015-12-28 04:57:15 -06:00
Seth Call
b48ea1cc59
* more fixing logic for paris tracks
2015-12-18 15:32:40 -06:00
Seth Call
ff6f133620
* import fixes for Paris
2015-12-18 11:35:56 -06:00
Seth Call
09483f219a
* paris music importing locally, stats refinement
2015-12-14 15:05:23 -06:00
Seth Call
34dcc27641
Merge branch 'develop' into feature/vst
2015-12-07 21:05:10 -06:00
Seth Call
886df5d092
* master mix controls for creator or delegated
2015-12-07 20:25:43 -06:00
Seth Call
d9f1becb9b
* merge
2015-12-04 11:37:59 -06:00
Seth Call
949ce8a513
* VRFS-3756 - webcam audio
2015-12-04 11:16:40 -06:00
Seth Call
223988f421
* better align
2015-12-04 09:39:33 -06:00
Seth Call
3adeef4dee
* csv/pdf links in place in the UI
2015-12-04 09:27:28 -06:00
Seth Call
5049e3f813
* generate CSV and PDF for jamtracks
2015-12-04 08:32:18 -06:00
Seth Call
54a437d6e1
* VRFS-3725 - frontend support for click tracks and tap-in creation
2015-12-03 14:21:07 -06:00
Seth Call
7f0fd988ce
* add gift card image
2015-11-30 05:07:47 -06:00
Seth Call
184bf2ba4d
* merge
2015-11-19 22:09:11 -06:00
Seth Call
c2772398a8
* importer
2015-11-19 22:07:38 -06:00
Seth Call
d3d2fbb210
* generate jmep automatically
2015-11-18 15:22:06 -06:00
Seth Call
7fbb215fca
* VRFS-3708 - allow redemption of gift cards
2015-11-13 07:12:58 -06:00
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
Seth Call
55ccf89e64
* VRFS-3396 took out carmen gem; database in production/staging has display names in db
2015-07-28 14:11:28 -05:00
Seth Call
4b7e7c1c7f
* ignore ssl errors in phantomjs
2015-07-20 07:58:15 -05:00
Seth Call
f6d54a57f5
* test fixes
2015-07-19 09:57:40 -05:00
Seth Call
3b71931e73
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -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
Seth Call
939f8cdf82
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -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
7b5cdbf390
VRFS-3106 : Populate country name and state(region) labels using carmen gem.
2015-05-06 15:35:41 -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
d4d8489ef1
VRFS-3007 : Fix faulty logic when extracting recording data. Addresses a few test failures.
2015-04-30 19:31:44 -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
Seth Call
022304c6af
* VRFS-3065 - permission error name change
2015-04-20 10:42:09 -05:00
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00: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
2f8d048dde
VRFS-2701 updated site validator lib to extract recording title for YouTube and SoundCloud URLs
2015-04-04 02:31:12 -04: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
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06: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
0907c1acd1
VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.
2015-02-19 01:06:50 -06:00
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
fa25e87659
Merge branch 'develop' into feature/site_validator
2015-02-10 03:17:33 +00:00
Seth Call
df60a43404
* adding gear dump
2015-02-09 18:07:49 -06:00
e466ca0f5a
VRFS-2698 implemented site_validator
2015-02-08 06:10:31 +00:00
90f3d9efe1
VRFS-2698 refactoring
2015-02-06 07:43:24 +00:00
d52f5b2372
VRFS-2698 repurposed urls into usernames
2015-02-06 07:43:24 +00: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
Seth Call
3496aa999f
* wip
2015-01-29 14:17:55 -06:00
Seth Call
f53c5c9612
*wip
2015-01-26 21:22:44 -06:00
a900087d87
VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests.
2015-01-11 19:17:18 -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
16667a9ce3
Fix typo.
2015-01-05 17:25:43 -06:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
9d5d36f059
VRFS-2540 : Clean out some existing recaptcha scaffolding.
...
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails. Respect application config for
“recaptcha_enable” at all levels higher than user level. Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -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
8a84ff5609
* fix broken tests because of removal of diagnostics, and fix bad logging pattern
2014-12-31 23:17:47 -06:00
Seth Call
116cf8cfce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-31 20:39:27 -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
Jonathan Kolyer
Steven Miers
Brian Smith