Jonathan Kolyer
|
9df947097f
|
VRFS-3681 develop branch merge review
|
2015-11-08 23:05:34 +00:00 |
|
Jonathan Kolyer
|
fb9a7c01af
|
VRFS-3681 develop branch merge tweaks
|
2015-11-08 23:02:18 +00:00 |
|
Jonathan Kolyer
|
f41aced15f
|
VRFS-3681 reverted changes for develop branch merge
|
2015-11-08 22:44:15 +00:00 |
|
Jonathan Kolyer
|
0f4fb0816e
|
VRFS-3681 removed files added by bundler
|
2015-11-08 22:25:59 +00:00 |
|
Jonathan Kolyer
|
57314a9b1c
|
VRFS-3681 reverting edits prior to develop branch merge
|
2015-11-08 22:24:31 +00:00 |
|
Jonathan Kolyer
|
d7a6bdaaba
|
VRFS-3681 mobile load preview image
|
2015-11-08 22:15:01 +00:00 |
|
Jonathan Kolyer
|
70f047dd3c
|
VRFS-3681 removed git merge artifcats
|
2015-11-08 22:06:19 +00:00 |
|
Jonathan Kolyer
|
7fc646babe
|
VRFS-3681 test run for develop merge
|
2015-11-08 21:31:38 +00:00 |
|
Jonathan Kolyer
|
958bb9346e
|
Merge branch 'feature/mobile' of bitbucket.org:jamkazam/jam-cloud into feature/mobile
|
2015-11-01 02:32:55 +00:00 |
|
Jonathan Kolyer
|
1bcee2e60c
|
Merge branch 'develop' into feature/mobile
|
2015-11-01 02:28:10 +00:00 |
|
Jonathan Kolyer
|
c27ed06455
|
VRFS-3681 add year and counter
|
2015-11-01 02:27:18 +00:00 |
|
Jonathan Kolyer
|
61e93b7d1d
|
VRFS-3681 fixed artist pagination
|
2015-10-29 03:17:47 +00:00 |
 Seth Call
|
b0c8c88524
|
* fix display issues with sales
|
2015-10-28 16:32:55 -05:00 |
|
Seth Call
|
9d8c46ca7c
|
* sale line items
|
2015-10-28 08:10:03 -05:00 |
|
Seth Call
|
76e3bb3284
|
* affilate quarterly payments
|
2015-10-27 16:21:16 -05:00 |
|
Seth Call
|
a84f344335
|
* disable resizing
|
2015-10-27 13:06:33 -05:00 |
|
Seth Call
|
68d165427c
|
* bump
|
2015-10-27 12:11:40 -05:00 |
|
Seth Call
|
806308ac01
|
* bump from top
|
2015-10-27 09:51:39 -05:00 |
|
Seth Call
|
86d33c0f79
|
* create mix not working; fixed
|
2015-10-27 09:48:07 -05:00 |
|
Seth Call
|
8d026a3fdb
|
* fix bug with stemId downoad
|
2015-10-27 09:20:37 -05:00 |
|
Seth Call
|
d52f6b570a
|
* add scroll and my mixes on by default
|
2015-10-26 16:49:55 -05:00 |
|
Seth Call
|
fbc2e9498f
|
* fix iphone/ipad actions, also stop doing popups anywhere
|
2015-10-26 16:03:43 -05:00 |
|
Seth Call
|
73a04d4d95
|
* typo added in video_upload
|
2015-10-24 05:13:33 -05:00 |
|
Jonathan Kolyer
|
1fe20d6c2b
|
merging develop
|
2015-10-24 01:58:49 +00:00 |
|
Jonathan Kolyer
|
2a0e733b84
|
VRFS-3672 adding :duration
|
2015-10-24 01:57:35 +00:00 |
|
Seth Call
|
af1da5ead4
|
* add pointers to admin
|
2015-10-23 15:08:54 -05:00 |
|
Seth Call
|
f002864a08
|
* most of VRFS-3674 (detect browser-based fraud) done
|
2015-10-23 14:42:51 -05:00 |
|
Seth Call
|
150c5da5b3
|
* remove rails react img
|
2015-10-23 07:52:33 -05:00 |
|
Seth Call
|
b2fca8cc0b
|
* VRFS-2818 - control both master/personal mix for volume/mute controls of media tracks
|
2015-10-22 11:08:34 -05:00 |
|
Seth Call
|
95ec9ce66e
|
* VRFS-3667 - put download buttons in client app view
|
2015-10-22 09:04:49 -05:00 |
|
Seth Call
|
0c5dbe2c68
|
* VRFS-3647 - add search capability to jamtrack page, and VRFS-3676 - poke redeem users
|
2015-10-22 05:51:49 -05:00 |
|
Jonathan Kolyer
|
8e88e7fe7e
|
Merge branch 'develop' into feature/mobile
|
2015-10-22 09:02:42 +00:00 |
|
Jonathan Kolyer
|
8e21fb1fe7
|
merging develop
|
2015-10-22 01:00:34 +00:00 |
|
Seth Call
|
d3d9a2db49
|
* VRFS-3668 - show download errors in popup player, VRFS-3659 - cache tracks in popup player
|
2015-10-21 10:44:02 -05:00 |
|
Seth Call
|
f086ff74c3
|
* fix how player occurs in native client
|
2015-10-21 08:36:41 -05:00 |
|
Seth Call
|
023648a5be
|
* VRFS-3673 - normalize non-jkz files
|
2015-10-21 06:45:30 -05:00 |
|
Seth Call
|
27328a7c65
|
* VRFS-3670 - affiliate rate usage
|
2015-10-20 21:09:58 -05:00 |
|
Jonathan Kolyer
|
ffa5fe1798
|
Merge branch 'develop' into feature/mobile
|
2015-10-20 00:40:05 +00:00 |
|
Jonathan Kolyer
|
93d11d6b3b
|
VRFS-3459 removed errand git merge inserts
|
2015-10-20 00:38:46 +00:00 |
|
Seth Call
|
9dbcdb2436
|
* help doc tweak
|
2015-10-19 17:53:50 -05:00 |
|
Seth Call
|
93e0be7bdd
|
* bump
|
2015-10-19 15:40:55 -05:00 |
|
Jonathan Kolyer
|
bfa3b0b8c9
|
VRFS-3459 accidental file adding
|
2015-10-19 20:00:09 +00:00 |
|
Jonathan Kolyer
|
7a2dd6ea0b
|
VRFS-3459 merging develop
|
2015-10-19 19:58:41 +00:00 |
|
Seth Call
|
5073c2d4e7
|
* show daily status
|
2015-10-19 14:34:06 -05:00 |
|
Seth Call
|
2b81276e1b
|
* sort by referrals
|
2015-10-19 14:06:18 -05:00 |
|
Seth Call
|
53f5c6d4df
|
* fix help doc link
|
2015-10-19 13:54:33 -05:00 |
|
Seth Call
|
515704898c
|
* make player list not be dynamic, and fix context.stats write
|
2015-10-19 13:42:39 -05:00 |
|
Seth Call
|
f0ece5f894
|
* allow custom mixes to be made even if full jamtrack not selected
|
2015-10-19 13:04:17 -05:00 |
|
Seth Call
|
993e12995c
|
* track redeem correctly; also try and fix admin
|
2015-10-19 12:56:52 -05:00 |
|
Seth Call
|
a63f9085f4
|
* VRFS-3664 - dont say dear anonymous in emails
|
2015-10-19 10:07:53 -05:00 |