4658f72f98
VRFS-3036 refactoring musician_search into base_search for band_search
2015-05-07 14:41:27 +00:00
Seth Call
0ea2931837
* add config to remove whitespace from credit card number. probably unnecessary; just doing now before release
2015-05-07 09:02:58 -05:00
Seth Call
12eeb460a3
* VRFS-3212 - track counts of concurrent packaging attempts
2015-05-07 08:49:15 -05:00
749c58f377
VRFS-3036 refactoring band search
2015-05-07 13:21:53 +00:00
ce3bf635f0
VRFS-3036 refactoring musician_search into base_search for band_search
2015-05-07 12:55:13 +00:00
Seth Call
05f5cd619a
* VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free
2015-05-05 16:38:29 -05:00
Seth Call
ceb00c1735
* remove jamtrack download ready notification
2015-05-05 14:36:07 -05:00
Seth Call
6c40ede050
* bug in VRFS-3176 jamtrack preview regenerator
2015-05-05 11:46:58 -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
Seth Call
d13204336b
* VRFS-3189 - don't include master track when checking for instruments
2015-05-04 22:06:35 -05:00
Seth Call
f31a40343e
* add jmep as warning to onboarding flags column
2015-05-04 21:45:26 -05:00
Seth Call
4d28915381
* VRFS-3177 - add spinner to playback and stop preloading all media on page
2015-05-04 17:48:14 -05:00
Seth Call
9144efb8fa
* VRFS-3175 - order filter by band dropdown
2015-05-04 14:50:27 -05:00
Seth Call
d77ee8cd23
* VRFS-3173 - stats on active sessions
2015-05-04 14:37:49 -05:00
4c4121e4d7
Merge with latest develop
2015-05-01 20:00:08 -05:00
571ae9a3d6
VRFS-3007 : Fix another musician search issue and a few tests.
2015-05-01 13:22:34 -05:00
Seth Call
1cd57cb4e8
* VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates
2015-05-01 12:09:18 -05:00
5b43688443
VRFS-3007 : Fix failure on musician search spec.
2015-04-29 15:34:28 -05:00
cf515a9cf0
VRFS-3007 : Fix tests and models failing due to PermissionError
2015-04-29 12:56:16 -05:00
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
Seth Call
1bd054d050
* VRFS-3094 - update style and minor issues in shopping cart screen
2015-04-27 15:42:38 -05:00
Seth Call
907e2a4552
* fix jamtrack shopping tests for the change in button text
2015-04-27 13:42:03 -05:00
Seth Call
933d56524c
* poke downloaded_since_sign on jamtrackright page
2015-04-24 14:58:31 -05:00
Seth Call
4cce21e7f8
* VRFS-3080 - partial refund manual process done
2015-04-23 16:20:21 -05:00
Seth Call
989518fa68
* VRFS-3082 - email alert if jamtrack fails
2015-04-23 10:34:17 -05:00
Seth Call
091f2be556
* make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues
2015-04-22 15:43:36 -05:00
Seth Call
05b4b8f3fa
* VRFS-2605 -tested mixer manifest with latest client with jamtrack offsets and all of that
2015-04-22 14:02:44 -05:00
Seth Call
49ef08ff5d
* prepare production db for preview URLS, and save jam_track after setting duration in the sync task
2015-04-22 09:44:57 -05:00
Seth Call
1ce41c5a54
* VRFS-2605 - refining jamtrack offset values and manifest for audiomixer, and fixnig bug with jamtrack monitoring applied to playcontrols.js by accident
2015-04-21 16:24:10 -05:00
Seth Call
655f59fc52
* remove puts
2015-04-21 14:08:16 -05:00
Seth Call
ed0d69db13
* require tzinfo explicitely
2015-04-21 13:54:08 -05:00
Seth Call
556347f35b
* VRFS-2605 compute offset and seeks in manifest
2015-04-21 13:46:33 -05:00
Seth Call
03072b2e8d
* VRFS-2605 - compute offset and seek based on client info
2015-04-21 11:26:55 -05:00
Seth Call
c29af72938
* fix jamtrack landing page formatting VRFS-3056
2015-04-20 22:13:30 -05:00
Seth Call
2480be23ab
* make the addition of duration column to jam tracks failable, since this has been applied to production in advance of the real migration
2015-04-20 20:40:50 -05:00
Seth Call
35ccd39979
* fix id-generator
2015-04-20 17:39:45 -05:00
Seth Call
8bb37c5a65
* fix incrementer
2015-04-20 14:56:10 -05:00
Seth Call
b60ded91d7
* fix typo in JamTrack download notification VRFS-3064
2015-04-20 13:58:58 -05:00
Seth Call
0236353ee7
VRFS-3048 - resync task for audio updates to existing jamtracks
2015-04-20 13:56:05 -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
Seth Call
375ec7008d
* wip
2015-04-20 10:42:00 -05:00
Seth Call
1763c151bd
* VRFS-3061 - deal with shopping cart porting over correctly when user logs in during shopping
2015-04-19 16:40:35 -05:00
Seth Call
fc99fbce6c
* VRFS-3058 - fix uniqueness constraint on ShoppingCart and test
2015-04-19 11:43:54 -05:00
Seth Call
3c37cbbf59
* VRFS-3042 - remove duplicate registrations on pagination
2015-04-17 14:01:07 -05:00
Seth Call
fefd5a3fda
* jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works
2015-04-16 15:44:38 -05:00
Seth Call
4cf4e21552
* VRFS-2938 - packaging phase now shows % indicator
2015-04-16 14:45:29 -05:00
005dfdaa91
Merge branch 'feature/jam_track_analytics' into develop
2015-04-16 11:11:07 -05:00
705e67a810
VRFS-2874 : Clean up code and logic - fixes problem of false positive.
2015-04-16 00:21:45 -05:00
4db40f6d3b
VRFS-2874 : Some prerequisite functionality required for analytics.
2015-04-15 18:22:55 -05:00
Seth Call
19ad2fbcc5
* VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO)
2015-04-14 16:39:39 -05:00
Seth Call
06c964a151
* VRFS-2977 - make facebook signup work with checkout flow
2015-04-14 14:12:24 -05:00
75f1098ca3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-14 03:13:27 -04:00
Seth Call
1183d0790c
* add default to exiting sales databases
2015-04-13 16:05:43 -05:00
Seth Call
eee6be5d0b
* VRFS-2978 - give temporary pass to payment screen if you just filled out info
2015-04-13 15:54:23 -05:00
b81222278d
merge develop
2015-04-13 08:16:45 -04:00
252beca091
VRFS-2895 added unsubscribe link to email footer that doesnt require login
2015-04-12 11:03:12 +00:00
Seth Call
ab2925ef88
VRFS-2821 - payment history screen added
2015-04-12 13:46:22 -05:00
5a4157c563
check for nil
2015-04-10 20:19:53 -04:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
246efbdaa8
merge develop
2015-04-09 20:47:01 -04:00
Seth Call
fd02e23572
* updated home page VRFS-2868
2015-04-08 22:44:21 -05:00
Seth Call
974049f204
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-08 14:36:48 -05:00
Seth Call
42dac058e1
VRFS-2884 - Update things in session and FTUE for default profile
2015-04-08 14:34:05 -05:00
3fd659c3df
VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query.
2015-04-08 12:53:09 -05:00
0a451742ef
merge develop
2015-04-06 21:26:54 -04:00
086b3bc3c4
VRFS-2795 styling and descriptions
2015-04-04 20:26:41 +00:00
e0d2feb84d
VRFS-2795 pagination
2015-04-04 17:29:15 +00:00
e4795d9297
VRFS-2795 fixed filter description issue
2015-04-04 15:36:15 +00:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
91e9e73644
VRFS-2701 adding SoundCloud/YouTube sources fully functional
2015-04-04 21:46:37 -04: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
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
4f7c43b9d8
VRFS-2795 cloning old search code into new musician_search
2015-04-02 14:52:16 +00:00
c3ede10f1d
merging feature/musician_profile_enhancements
2015-04-02 14:51:33 +00:00
a87c08afe3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-01 23:09:51 -04:00
Seth Call
c0e541b49d
* importer
2015-04-01 20:38:54 -05:00
Seth Call
d3cc9fa6af
* download master command
2015-04-01 20:35:23 -05:00
4c2d4958fe
VRFS-2894 Update email / user info in recurly upon finalize. Test to verify.
2015-03-31 20:25:54 -05:00
Seth Call
b1b2d3ad24
* VRFS-2869 - band landing page
2015-03-31 16:17:17 -05:00
Seth Call
47c6b3ec16
* VRFS-2870 - tests add for individual jam track song page
2015-03-31 15:17:43 -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
ddc4decfd3
merging feature/musician_profile_enhancements
2015-03-30 06:07:43 +00:00
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05:00
83c00ea6e4
merge develop
2015-03-29 10:12:42 -04:00
401fd43849
Merge branch 'feature/jam_track_ui_2' into develop
2015-03-27 15:48:08 -05:00
4f08f6acad
Merge and fix
2015-03-27 09:54:01 -05:00
Seth Call
e2957592ea
VRFS-2605 - audiomixer manifest updated for volume and offsets
2015-03-26 17:45:23 -05:00
3f994e3993
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-26 11:59:49 -05:00
bb4ea7cd94
Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2
2015-03-26 11:59:42 -05:00
Seth Call
ef78471b59
Merge cherry pick
2015-03-26 11:58:41 -05:00
Seth Call
4a36bc6982
* VRFS-2988 - relax position duplication constraint
2015-03-26 10:16:14 -05:00
21322318d8
VRFS-2795 latency ordering
2015-03-26 06:28:38 +00:00
f3344affaf
VRFS-2795 distance sort order
2015-03-26 05:56:43 +00:00
9eeb0e454b
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-26 03:31:21 +00:00
Seth Call
0848a59082
* merged develop again
2015-03-25 14:32:03 -05:00
Seth Call
f0c4647ef5
* VRFS-2981 - check for create_type = nil in scheduled_rsvp
2015-03-25 11:26:32 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
adef8c8c45
VRFS-2830 : Payment History
...
API, client, view, styles and test
2015-03-24 17:13:09 -05:00
Seth Call
18563ff065
* VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling
2015-03-24 14:59:20 -05:00
Seth Call
bfe302b2f1
* merged
2015-03-24 14:43:48 -05:00
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
1c0407cca4
* wip
2015-03-24 10:19:21 -05:00
9face3b3f9
VRFS-2701 wip presence/sample edit
2015-03-23 16:27:36 -04:00
8c2df0bb6b
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
2015-03-23 20:06:32 +00:00
Seth Call
04aa1a9b3c
* wip
2015-03-23 08:52:52 -05:00
96a816f317
merge develop
2015-03-21 10:06:53 -04:00
Seth Call
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
36b4179492
* VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only)
2015-03-20 17:26:56 -05:00
Seth Call
f29a9d7465
* wip
2015-03-20 16:15:13 -05:00
Seth Call
49368e2e66
Merge branch 'hotfix/recording_fix' into develop
2015-03-20 11:26:50 -05:00
Seth Call
301b365044
* VRFS-2968 - escape strings passed to JamTrack builder
2015-03-20 09:44:25 -05:00
Seth Call
10f25be8c4
* replace old style of volume changes VRFS-2964
2015-03-20 08:53:34 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
bb35535262
* VRFS-2941 - fix meddling of mount_uplaoder with existing URS
2015-03-17 10:55:16 -05:00
c91fd0cb0e
merge develop
2015-03-17 03:10:22 -04:00
Seth Call
ab72438a3f
* VRFS-2932 - make preview apply to all jam track tracks
2015-03-16 17:50:38 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -05:00
b91bc09817
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-15 11:09:21 -04:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
948174f19a
VRFS-2701 musical experience bug fix
2015-03-12 21:34:20 -04:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
41626860a9
VRFS-2795 replacing musician page with new search filter
2015-03-12 04:39:20 +00:00
Seth Call
9c2a0c79f6
* VRFS-2866 - making listing of JamTracks not require a logged in user
2015-03-11 21:30:56 -05:00
Seth Call
f2b453ea19
* VRFS-2917 - shopping cart can be anonymous
2015-03-11 20:55:11 -05:00
4ebbff42cc
VRFS-2823 : Jam Tracks shopping page updates
...
* Remove individual labels from search and show a “Filter JamTracks”
label.
* Style
* Add filter box for artist & populate
* Bind events in JS and pass through to api
* Tweak api park from “artist_name” to “artist”
2015-03-11 15:40:12 -05:00
Seth Call
6c82e00d00
* VRFS-2876 cleaning up preview downloadability in jam-admin
2015-03-11 09:20:45 -05:00
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
b998d28c37
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-10 04:33:37 +00:00
d865d0a1fa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-09 20:25:28 -04:00
Seth Call
882f2267cf
* fixing urls getting messed with my mount uploader
2015-03-09 16:35:39 -05:00
e91ee68d58
VRFS-2822 : Add options to query for both filtering on artist and grouping on artist (to get a list of artists through existing query infrastructure).
2015-03-09 10:11:47 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
33f10e3197
VRFS-2795 fixing search specs
2015-03-09 06:13:56 +00:00
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
3549ea117c
VRFS-2795 generating json from filter settings
2015-03-06 07:20:14 +00:00
2b9bebb438
VRFS-2795 generate JSON from filter settings
2015-03-06 07:03:30 +00:00
15559f593f
VRFS-2795 sortorder, refactoring
2015-03-06 06:33:38 +00:00
3810aecb00
merging feature/musician_profile_enhancements
2015-03-06 05:12:13 +00:00
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05:00
d514a67be5
VRFS-2795 changed gig/studio vals to match profile enhancements branch
2015-03-05 05:51:26 +00:00
c6497c8457
Kill puts.
2015-03-04 16:31:03 -06:00
003b06cae0
VRFS-2782 : Fix error found by test.
2015-03-04 16:14:26 -06:00
a34031728e
Cleanup
2015-03-04 16:14:01 -06:00
ead2921e84
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-03-04 16:13:58 -06:00
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
Jonathan Kolyer
Seth Call
Steven Miers
Brian Smith