Jonathan Kolyer
|
379fe788a3
|
vrfs988: added clear=all for fans template
|
2014-01-12 02:11:19 -06:00 |
|
Jonathan Kolyer
|
af4f03c91e
|
vrfs988: refresh both sidebar and searchResults when search params changed
|
2014-01-12 02:02:15 -06:00 |
|
Jonathan Kolyer
|
ddd1b93420
|
vrfs988: syncing the search type selections between searchResults and sidebar
|
2014-01-12 01:53:39 -06:00 |
|
Jonathan Kolyer
|
8b7fcaf569
|
vrfs988: updated band template value names
|
2014-01-12 01:48:59 -06:00 |
|
Jonathan Kolyer
|
48bde580ae
|
vrfs988: fixed filter searchtype bug
|
2014-01-12 01:48:15 -06:00 |
|
Jonathan Kolyer
|
1a39f6296b
|
vrfs988: changed band url to use website
|
2014-01-12 01:40:30 -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
|
a4816fecfd
|
vrfs988: refactored search results processing
|
2014-01-11 22:44:58 -06:00 |
 Seth Call
|
660e452996
|
* fixing weboscket gateway problem ;it's pulling in a very old version of actionpack due to some gemfile issue
|
2014-01-12 04:28:07 +00:00 |
|
Jonathan Kolyer
|
cdb2b9fab9
|
vrfs988: sidebar/searchresults
|
2014-01-11 20:18:20 -06:00 |
|
Seth Call
|
72a97198ed
|
* up activerecord in websocket gateway to match web
|
2014-01-11 19:52:30 +00: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
|
2229babf68
|
vrfs-988: refactoring search as text by entity, rather than site-wide
|
2014-01-11 06:27:05 -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
|
cc4cd61930
|
nake char range explicit
|
2014-01-10 21:03:33 +00:00 |
|
jam
|
09f30e3880
|
Support for xml with attr_accessor
|
2014-01-10 21:02:52 +00:00 |
|
Seth Call
|
230a4d3f64
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-10 16:28:18 +00:00 |
|
Seth Call
|
1555af6db8
|
* VRFS-984 finished. subpath is /resque
|
2014-01-10 16:25:55 +00:00 |
|
Seth Call
|
be2a7ecc48
|
* removing git merge syntax from jam_ruby
|
2014-01-09 13:53:47 +00:00 |
|
Jonathan Kolyer
|
08e7496a40
|
merge conflict
|
2014-01-08 21:33:15 -06: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
|
783a7c3adf
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 22:55:51 +00:00 |
|
Seth Call
|
83409e9da8
|
* adding resque gem to Gemfile
|
2014-01-08 22:55:44 +00:00 |
|
jam
|
e827f274b2
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 22:42:24 +00:00 |
|
jam
|
9ed2210500
|
websock set timeout on development build
|
2014-01-08 22:42:10 +00:00 |
|
Seth Call
|
519650e265
|
* typo in audiomixer
|
2014-01-08 22:05:41 +00:00 |
|
Seth Call
|
9e7debdeda
|
* merged
|
2014-01-08 21:49:35 +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
|
d899b88dd1
|
switching failing specs to expect() syntax
|
2014-01-08 15:21:32 -06:00 |
|
Anthony Davis
|
9127d1861d
|
VRFS-923 commenting out AWS wipe in web as well
|
2014-01-08 13:59:53 -06:00 |
|
Seth Call
|
88888a6846
|
* oops. didn't realize that the client footer is reused by 2 other templates
|
2014-01-08 19:49:21 +00: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 |