jam
|
8c51eb31db
|
Fix test and make sure icecast is at the bottom of the sql command chain
|
2014-01-08 01:42:59 +00:00 |
 Seth Call
|
c92dd66f24
|
* moving icecast to bottom
|
2014-01-07 23:32:08 +00:00 |
|
jam
|
1ac74eadb3
|
Icecast changes
|
2014-01-07 14:32:12 -06:00 |
|
jam
|
57a9571483
|
resolve conflict
|
2014-01-04 08:04:24 -06:00 |
|
Seth Call
|
45a18c4449
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-06 20:35:41 +00:00 |
|
Seth Call
|
fa23c267f5
|
* VRFS-946 and VRFS-922 - in-session recording features complete
|
2014-01-06 20:35:35 +00:00 |
Chris Doughty
|
d8cb2c72c4
|
VRFS-951 Pushing only develop or master branch files as debians
|
2014-01-05 21:35:22 -06:00 |
|
Seth Call
|
ba3b9ab873
|
* VRFS-946 - in-session recording
|
2014-01-05 03:47:23 +00:00 |
|
jam
|
b4260a4ed1
|
adde icecast file to gem library
|
2014-01-04 07:40:08 -06:00 |
Jonathan Kolyer
|
b731bd84e0
|
vrfs-927: updated db cols for carrierwave integration
|
2014-01-04 03:11:31 -06: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
|
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 |
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 |
|
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 |
|
Seth Call
|
8bd715c7ea
|
* VRFS-821 many changes for upload apis, mostly
|
2013-12-17 19:44:30 +00:00 |
|
Seth Call
|
d97a960a0e
|
* VRFS-821 many changes for upload apis, mostly
|
2013-12-17 19:44:21 +00:00 |
|
Jonathan Kolyer
|
196b895f32
|
vrfs-884: merge conflict
|
2013-12-16 12:36:41 -06:00 |
Brian Smith
|
5ea5fd3d63
|
VRFS-877 add missing sql file
|
2013-12-15 20:26:21 -05:00 |
|
Brian Smith
|
5b5aef15c8
|
VRFS-877 band photo work
|
2013-12-15 16:27:11 -05:00 |
|
Jonathan Kolyer
|
4c804d2f94
|
vrfs-884: added band geocoding; inital band filtering tests; refactoring musicians filter page
|
2013-12-09 07:15:59 -06:00 |
|
Brian Smith
|
7aeb182f1f
|
VRFS-866 band invitations / notifications
|
2013-11-26 02:47:56 -05:00 |
|
Seth Call
|
95bc077634
|
* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)
|
2013-11-16 14:05:23 +00:00 |
|
Seth Call
|
9805775496
|
* VRFS-813 - done for this feature
|
2013-11-16 04:35:40 +00:00 |
|
Seth Call
|
db76c34ba5
|
* VRFS-813 -most all frontend changes needed for start/stop recordings
|
2013-11-03 14:55:55 -06:00 |
|
Jonathan Kolyer
|
b48a298af5
|
merge conflict
|
2013-11-03 03:16:14 -06:00 |
|
Jonathan Kolyer
|
291a3a8ac2
|
vrfs-774: changing country value from USA to US for max_mind_geo support
|
2013-11-03 01:49:10 -06:00 |
|
Brian Smith
|
5e79e34634
|
added biography to user model
|
2013-11-02 23:35:18 -04:00 |
|
Jonathan Kolyer
|
dd5be13e9f
|
vrfs-774: updated max_mind_geo/users table for geocoded searches
|
2013-10-28 21:41:52 -05:00 |
|
Seth Call
|
333d158fc6
|
* VRFS-780; forgot db migrations too. sheesh
|
2013-10-21 17:17:19 -05:00 |
|
Seth Call
|
32a4297569
|
* VRFS-780 - finished, tested, etc
|
2013-10-21 17:13:53 -05:00 |
|
Seth Call
|
f38ca2721a
|
* VRFS-734 - adding all user progression tracking that is possible currently
|
2013-09-30 02:37:22 +00:00 |
|
Seth Call
|
a2ab44648b
|
* VRFS-694 adding newrelic to rails
|
2013-09-18 20:14:37 +00:00 |
|
Seth Call
|
4d723bacaf
|
* fixing relative paths in gems for develop branch as well
|
2013-09-16 02:28:44 +00:00 |
|
Seth Call
|
a091c22aa6
|
merging jam-db into db
|
2013-09-15 17:58:54 +00:00 |