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

155 Commits

Author SHA1 Message Date
Jonathan Kolyer 832e716e8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-28 19:52:45 +00:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Jonathan Kolyer 3eca6aeee5 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-04 05:59:31 +00:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Seth Call d959a17be4 * affiliate program in place VRFS-3030 2015-05-28 08:20:14 -05:00
Jonathan Kolyer da58ac6eab merging 2015-05-22 08:20:07 +00:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -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
Steven Miers 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -05:00
Seth Call 2495f58bf5 * VRFS-3220 - estimated taxes fixed 2015-05-07 14:48:16 -05:00
Jonathan Kolyer 13c1c5311e VRFS-3036 more refactoring 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 7e2e5241bf VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 19:02:21 +00:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 4cce21e7f8 * VRFS-3080 - partial refund manual process done 2015-04-23 16:20:21 -05:00
Seth Call ed0d69db13 * require tzinfo explicitely 2015-04-21 13:54:08 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call 06c964a151 * VRFS-2977 - make facebook signup work with checkout flow 2015-04-14 14:12:24 -05:00
Brian Smith b81222278d merge develop 2015-04-13 08:16:45 -04:00
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04:00
Seth Call 821ca9d76a * VRFS-2875 - sales record keeping as well as recurly hook processing 2015-04-03 15:34:12 -05:00
Jonathan Kolyer c3ede10f1d merging feature/musician_profile_enhancements 2015-04-02 14:51:33 +00:00
Brian Smith a87c08afe3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-01 23:09:51 -04: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
Jonathan Kolyer ddc4decfd3 merging feature/musician_profile_enhancements 2015-03-30 06:07:43 +00:00
Brian Smith 83c00ea6e4 merge develop 2015-03-29 10:12:42 -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
Seth Call f2b453ea19 * VRFS-2917 - shopping cart can be anonymous 2015-03-11 20:55:11 -05:00
Jonathan Kolyer b998d28c37 VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-10 04:33:37 +00:00
Brian Smith d865d0a1fa Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-09 20:25:28 -04:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Jonathan Kolyer d95279e694 VRFS-2795 merging feature/musician_profile_enhancements 2015-02-28 20:18:56 +00:00
Brian Smith 4d133e0043 merge develop 2015-02-28 02:24:23 -05:00
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -06:00
Seth Call 9415593244 * merged 2015-02-27 08:41:49 -06:00
Seth Call 8205b5ea58 * VRFS-2841 - load jmep into the backend 2015-02-27 08:37:12 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Jonathan Kolyer 2ea1259060 merging feature/musician_profile_enhancements 2015-02-24 06:08:33 +00:00
Jonathan Kolyer 83f3d56238 VRFS-2795 musician search first draft 2015-02-23 06:21:36 +00:00
Brian Smith 20ac47a2e1 Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-21 23:36:06 -05:00
Brian Smith 500af2bc05 merge develop (had lots of migration issues) 2015-02-20 08:35:59 -05:00
Steven Miers 0907c1acd1 VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate. 2015-02-19 01:06:50 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Brian Smith 28ff54b000 VRFS-2695 wip new profile API 2015-02-13 03:16:48 -05:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Brian Smith 80305c05aa Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-02 19:22:33 -05:00
Seth Call 96bc9487c4 * merged 2015-01-29 16:13:40 -06:00
Brian Smith f521f3ba4c VRFS-2689 new ruby models supporting db schema updates 2015-01-29 00:48:24 -05:00