Brian Smith
|
1b3fdee99e
|
VRFS-933 fix issues
|
2014-01-04 12:35:15 -05:00 |
|
Brian Smith
|
8b87b11f4d
|
VRFS-933 merge with develop
|
2014-01-04 12:24:11 -05:00 |
|
Brian Smith
|
a2b34d68dd
|
VRFS-933 notification bug fixes
|
2014-01-04 12:20:28 -05:00 |
jam
|
636a37694c
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-04 10:31:00 -06:00 |
|
Brian Smith
|
7ef959782e
|
VRFS-933 notifications
|
2014-01-04 10:40:21 -05:00 |
|
jam
|
57a9571483
|
resolve conflict
|
2014-01-04 08:04:24 -06:00 |
|
jam
|
b4260a4ed1
|
adde icecast file to gem library
|
2014-01-04 07:40:08 -06:00 |
Jonathan Kolyer
|
c94537da62
|
vrfs-927: added carrierwave-direct
|
2014-01-04 03:22:29 -06:00 |
|
Jonathan Kolyer
|
9e4995a55b
|
vrfs-927: carrrierwave integration
|
2014-01-04 03:15:19 -06:00 |
|
Jonathan Kolyer
|
b731bd84e0
|
vrfs-927: updated db cols for carrierwave integration
|
2014-01-04 03:11:31 -06:00 |
|
Jonathan Kolyer
|
4c9d2f0c29
|
vrfs-927: carrierwave integration fixes
|
2014-01-04 03:10:58 -06:00 |
Chris Doughty
|
a99d793e6c
|
VRFS-750 Starting generic page for 503 error
|
2014-01-02 19:35:50 -06:00 |
|
Brian Smith
|
3872898b95
|
VRFS-933 notification work
|
2014-01-02 14:57:16 -05:00 |
|
Brian Smith
|
452ddb3ff0
|
VRFS-933 more notification work; fixed test failures
|
2014-01-01 22:06:59 -05:00 |
|
Brian Smith
|
07abf26ced
|
VRFS-933 notification work
|
2014-01-01 20:02:40 -05:00 |
Daniel Weigh
|
2d51d04bbd
|
VRFS-948 Formatting updates
Will possibly need to revisit in the context of 294
|
2014-01-01 19:33:27 -05:00 |
|
Daniel Weigh
|
c00267f31c
|
VRFS-948 / VRFS-930 / VRFS-931 Formatting updates
Will possibly need to revisit in the context of 294
|
2014-01-01 15:41:40 -05:00 |
|
Daniel Weigh
|
e76244c360
|
VRFS-940 Change Avatar link borked.
Add in avatar.
|
2013-12-31 23:24:10 -05:00 |
Brian Smith
|
051b8eec5e
|
remove crash dump file
|
2013-12-30 22:36:00 -05:00 |
|
Brian Smith
|
5b31e802d6
|
VRFS-933 more notification work
|
2013-12-30 22:35:38 -05:00 |
 Seth Call
|
c3954d65f0
|
* delete existing tracks on older migration that will break existing deployments
|
2013-12-30 19:16:08 +00:00 |
|
Seth Call
|
73b04ba5fc
|
* oomps--left in my local capybara-screenshot reference
|
2013-12-30 19:10:12 +00:00 |
|
Seth Call
|
e4ed571dcb
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-12-30 18:34:26 +00:00 |
|
Seth Call
|
ab70d15eaf
|
* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)
|
2013-12-30 18:34:15 +00:00 |
|
Daniel Weigh
|
e22784c6c3
|
VRFS-294 Adjustments to HTML/ CSS.
Account Profile Avatar page
|
2013-12-29 21:04:07 -05:00 |
Brian Smith
|
102306e4d1
|
VRFS-933 notification work
|
2013-12-29 20:49:44 -05:00 |
|
Daniel Weigh
|
90f81e0994
|
VRFS-934 Remove extraneous scrollbar
due to explicit height in markup
|
2013-12-29 16:42:18 -05:00 |
|
Daniel Weigh
|
56bf445610
|
VRFS-935 Account identity screen borked.
|
2013-12-29 15:55:55 -05:00 |
|
Daniel Weigh
|
144f97f470
|
VRFS-935 Account identity screen borked.
|
2013-12-29 15:52:29 -05:00 |
|
Brian Smith
|
1806c5245f
|
VRFS-933 notification work
|
2013-12-29 14:40:21 -05:00 |
|
Daniel Weigh
|
7bb4b4a3c8
|
VRFS-936 Session header bar missing
|
2013-12-29 13:14:50 -05:00 |
|
Brian Smith
|
7e78163bb9
|
VRFS-933 notification work
|
2013-12-28 23:51:35 -05:00 |
Anthony Davis
|
4a9ad7b733
|
VRFS-937 - locking 'gon' to ~>4.1.0 to fix test failures
|
2013-12-28 11:54:53 -06:00 |
|
Brian Smith
|
75b9b97c60
|
fix warning related to ruby- prefix in .ruby-version files
|
2013-12-27 16:28:28 -05:00 |
|
Jonathan Kolyer
|
7212f20a0f
|
vrfs-927: admin editing buzz promotions
|
2013-12-22 10:19:39 -06:00 |
|
Jonathan Kolyer
|
ec126793c7
|
vrfs-927: added new promotional table for home page data
|
2013-12-22 05:22:04 -06:00 |
|
Jonathan Kolyer
|
fcd093f5a6
|
vrfs737: added first_recording_at
|
2013-12-21 23:23:33 -06:00 |
|
Jonathan Kolyer
|
fa05c3eb5d
|
vrfs737: added user progression admin panel
|
2013-12-21 23:22:54 -06:00 |
|
Jonathan Kolyer
|
8fa8895944
|
vrfs-743: dropped expire date for read to 20 years, as 25 years is too long for S3
|
2013-12-21 22:01:25 -06:00 |
|
Seth Call
|
d8a5dbd031
|
* making a test as pending that fails only on build server for now
|
2013-12-21 16:35:17 +00:00 |
|
Seth Call
|
182242c7fb
|
* VRFS-856 - hopefully the fix
|
2013-12-21 15:12:25 +00:00 |
|
Seth Call
|
9943e4518b
|
* oops. adding path to poltergeist gem
|
2013-12-21 02:43:55 +00:00 |
|
Seth Call
|
c784b9faa0
|
* fixing websocket tests
|
2013-12-21 00:17:35 +00:00 |
|
Seth Call
|
8deced77c7
|
* pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken
|
2013-12-20 23:44:12 +00:00 |
|
Seth Call
|
a68235f280
|
* adding 'select' to dialog-inner so it'll look JKish
|
2013-12-20 22:24:14 +00:00 |
|
Seth Call
|
242016c38b
|
* VRFS-821 - recordings manager changes
|
2013-12-20 22:01:51 +00:00 |
|
Daniel Weigh
|
9c6ccee6f0
|
VRFS-294 Adjustments to HTML/ CSS.
|
2013-12-20 07:04:58 -05:00 |
|
Jonathan Kolyer
|
0ecbf9f047
|
vrfs-916: added toggles for fan/musician; misc fan tweaks
|
2013-12-18 22:12:28 -06:00 |
|
Jonathan Kolyer
|
4b3b8491b3
|
vrfs-916: added favorite_count method
|
2013-12-18 22:10:55 -06:00 |
|
Jonathan Kolyer
|
f7c08ce472
|
vrfs-916: added fan page branching logic
|
2013-12-18 17:59:02 -06:00 |