 Seth Call
|
7d90425864
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-15 22:20:29 +00:00 |
|
Seth Call
|
63d6f428b3
|
* VRFS-997 - mix notifications
|
2014-01-15 22:15:33 +00:00 |
|
Seth Call
|
dc781f04ad
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-15 18:00:59 +00:00 |
|
Seth Call
|
b8829b417a
|
* VRFS-997 - mix complete notification
|
2014-01-15 18:00:45 +00:00 |
|
Seth Call
|
f6d1869d52
|
* adding folders for the various jobs
|
2014-01-14 21:16:38 -06: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 |
|
Seth Call
|
a7fa73cfb3
|
* VRFS-801 still working out some mixer devops issues now;
|
2014-01-13 22:48:55 +00:00 |
|
Seth Call
|
50595d155c
|
* VRFS-801 - closer to all fixes required for mixing
|
2014-01-13 13:44:28 +00:00 |
|
Seth Call
|
8f5b021464
|
* adding fixed test
|
2014-01-13 13:23:09 +00:00 |
|
Seth Call
|
da784f2cd0
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-13 11:23:41 +00:00 |
|
Seth Call
|
a61ff76dae
|
* stringifying id field in response to client downloads
|
2014-01-13 11:23:35 +00:00 |
Brian Smith
|
6d42e42c18
|
VRFS-987 backend support for session/recording likes, plays, and comments
|
2014-01-12 12:51:06 -05:00 |
Jonathan Kolyer
|
e0d8dd286a
|
vrfs988: updated to work with new search attribute names
|
2014-01-12 02:58:04 -06:00 |
|
Jonathan Kolyer
|
e539157d76
|
Merge branch 'develop' into vrfs988
|
2014-01-12 02:53:11 -06:00 |
|
Jonathan Kolyer
|
74e95ad908
|
vrfs988: added band spec and band.website value integrity on save
|
2014-01-12 02:49:57 -06:00 |
|
Jonathan Kolyer
|
48bde580ae
|
vrfs988: fixed filter searchtype bug
|
2014-01-12 01:48:15 -06:00 |
|
Jonathan Kolyer
|
da980ce699
|
vrfs988: refactoring search results; added fans/bands result template handling
|
2014-01-11 23:34:23 -06:00 |
|
Jonathan Kolyer
|
87ae9d97df
|
vrfs988: refactored search with one accessor for text and filter type searches
|
2014-01-11 09:27:56 -06:00 |
|
Jonathan Kolyer
|
ecdfde2cdb
|
vrfs988: sync api wrapper with search model
|
2014-01-11 09:12:26 -06:00 |
|
Jonathan Kolyer
|
0279b05454
|
vrfs-988: fixed text search return value
|
2014-01-11 08:59:09 -06:00 |
|
Jonathan Kolyer
|
ac100e0898
|
vtfs-988: fixing user text search to use musician
|
2014-01-11 06:50:51 -06:00 |
|
Jonathan Kolyer
|
fa0b3eeb70
|
vrfs-988: ran band_search tests
|
2014-01-11 06:37:55 -06:00 |
|
Jonathan Kolyer
|
3d75f8dd97
|
vrfs-988: refactoring search as text by entity, rather than site-wide
|
2014-01-11 06:26:40 -06:00 |
|
Seth Call
|
26f751cdc4
|
* sending 'downloadavailable' messages when mix becomes available
|
2014-01-11 05:34:26 +00:00 |
|
Seth Call
|
eb7adbd303
|
* working out more issues with VRFS-801
|
2014-01-11 05:23:29 +00: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 |
|
Jonathan Kolyer
|
401a97d566
|
Merge branch 'develop' into vrfs927
|
2014-01-10 18:13:00 -06:00 |
|
Jonathan Kolyer
|
85d6129a50
|
vrfs-927: fixing latest promotions
|
2014-01-10 18:10:14 -06:00 |
|
jam
|
7ec4be3063
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-10 23:53:25 +00:00 |
|
jam
|
b01fb4a818
|
baseline for icecast test cases
|
2014-01-10 23:53:16 +00:00 |
|
jam
|
09f30e3880
|
Support for xml with attr_accessor
|
2014-01-10 21:02:52 +00:00 |
|
Jonathan Kolyer
|
08e7496a40
|
merge conflict
|
2014-01-08 21:33:15 -06:00 |
|
Seth Call
|
be2a7ecc48
|
* removing git merge syntax from jam_ruby
|
2014-01-09 13:53:47 +00:00 |
|
Jonathan Kolyer
|
c576901d0d
|
fixed merge conflict
|
2014-01-08 21:32:23 -06:00 |
|
Seth Call
|
0b723362ae
|
* adding resque to websocket-gateway
|
2014-01-09 02:53:04 +00:00 |
|
Jonathan Kolyer
|
e5d23cc3bd
|
merge conflicts
|
2014-01-08 18:45:34 -06:00 |
|
Jonathan Kolyer
|
785817d299
|
vrfs-927: added initial promo latest support
|
2014-01-08 18:38:04 -06:00 |
|
Jonathan Kolyer
|
4b85863a33
|
vrfs-927: buzz admin fixes
|
2014-01-08 18:00:22 -06:00 |
|
Seth Call
|
83409e9da8
|
* adding resque gem to Gemfile
|
2014-01-08 22:55:44 +00:00 |
|
Seth Call
|
519650e265
|
* typo in audiomixer
|
2014-01-08 22:05:41 +00:00 |
|
Seth Call
|
207481ffbd
|
* audiomixer move
|
2014-01-08 21:49:04 +00:00 |
|
Seth Call
|
59bf00a97e
|
* DownloadAvailable proto msg added to help poke client when downloads become available
|
2014-01-08 21:24:21 +00:00 |
Anthony Davis
|
9127d1861d
|
VRFS-923 commenting out AWS wipe in web as well
|
2014-01-08 13:59:53 -06:00 |
|
Seth Call
|
03e4dfdc49
|
* removing wipe commands for now
|
2014-01-08 18:22:53 +00:00 |
|
Seth Call
|
40480f1484
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 18:04:21 +00:00 |
|
Seth Call
|
a400c0f289
|
* VRFS-971 adding progress at bottom of fotor
|
2014-01-08 18:04:11 +00:00 |
|
Anthony Davis
|
fedea2cdc3
|
VRFS-923
|
2014-01-08 07:04:23 -06:00 |
|
Anthony Davis
|
273495698a
|
VRFS-923 wrong sdk/method
|
2014-01-08 05:51:55 -06:00 |