 Seth Call
|
e63e718091
|
* merged
|
2014-01-25 14:19:12 -06:00 |
|
Seth Call
|
96768b7979
|
* VRFS-1022 finished
|
2014-01-25 14:03:14 -06:00 |
Brian Smith
|
d6a38f6bee
|
VRFS-986 bug fixes
|
2014-01-23 21:43:49 -05:00 |
|
Brian Smith
|
30b13ed538
|
merge develop
|
2014-01-22 21:21:40 -05:00 |
|
Seth Call
|
fcec0a776b
|
* icecast working locally on my mac (VRFS-1002)
|
2014-01-21 14:51:03 +00:00 |
|
Brian Smith
|
aa056d53fd
|
VRFS-986 recent history sidebar for landing pages
|
2014-01-21 01:45:51 -05:00 |
|
Seth Call
|
c91940852b
|
* going to 'hide' integrate icecast into sessions.sql' from staging for now
|
2014-01-19 05:20:40 +00:00 |
|
Seth Call
|
dea36d897f
|
* VRFS-982 and VRFS-1003 - making every table that's directly related to music_session be UNLOGGED
|
2014-01-19 05:17:30 +00:00 |
|
Seth Call
|
5c8e315ee5
|
* pending didn't take
|
2014-01-19 03:32:36 +00:00 |
|
Seth Call
|
e57946afd2
|
* fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006)
|
2014-01-19 02:20:44 +00:00 |
|
Seth Call
|
8644f4cbc3
|
* VRFS-1006 admin pages added to icecast
|
2014-01-17 19:55:26 +00:00 |
|
Seth Call
|
5d6e34f374
|
* VRFS-1000 - mapped all the castles, got the xml working, and added more tests
|
2014-01-17 04:51:19 +00:00 |
jam
|
10687093c1
|
Resolve conflicts
|
2014-01-14 21:24:45 +00:00 |
|
jam
|
b15604c148
|
Icecast modules and test
|
2014-01-14 21:22:05 +00:00 |
|
Brian Smith
|
59f6e10e55
|
VRFS-986 recording landing page work
|
2014-01-14 02:49:21 -05:00 |
|
Seth Call
|
a7fa73cfb3
|
* VRFS-801 still working out some mixer devops issues now;
|
2014-01-13 22:48:55 +00:00 |
|
Brian Smith
|
6d42e42c18
|
VRFS-987 backend support for session/recording likes, plays, and comments
|
2014-01-12 12:51:06 -05:00 |
|
Seth Call
|
f5a271c35b
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-11 04:57:30 +00:00 |
|
Seth Call
|
d89ce4c140
|
* VRFS-801 - almost working on my dev machine
|
2014-01-11 04:57:07 +00:00 |
|
jam
|
7ec4be3063
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-10 23:53:25 +00:00 |
|
jam
|
cc4cd61930
|
nake char range explicit
|
2014-01-10 21:03:33 +00:00 |
|
Seth Call
|
1555af6db8
|
* VRFS-984 finished. subpath is /resque
|
2014-01-10 16:25:55 +00:00 |
Jonathan Kolyer
|
e5d23cc3bd
|
merge conflicts
|
2014-01-08 18:45:34 -06:00 |
|
jam
|
f003fb2501
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 01:43:13 +00:00 |
|
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 |