Brian Smith
|
6d482a034d
|
VRFS-986 more landing page work
|
2014-01-16 02:50:13 -05:00 |
|
Brian Smith
|
4f9e36a332
|
VRFS-986 more landing page work
|
2014-01-16 01:55:36 -05:00 |
|
Brian Smith
|
59f6e10e55
|
VRFS-986 recording landing page work
|
2014-01-14 02:49:21 -05:00 |
 Seth Call
|
59c1b02e1c
|
* comment in god file about pending removal
|
2014-01-13 22:53:37 +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
|
43572c1524
|
* fixing rake routes bug
|
2014-01-13 13:57:14 +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
|
34b96db2c1
|
* updating nav of jam-admin and adding mixes page
|
2014-01-13 11:24:16 +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 |
|
Seth Call
|
f79d3bdd70
|
* fixing bad name in debian scripts from audimxer to audiomixer
|
2014-01-13 11:22:28 +00:00 |
|
Brian Smith
|
753dc22e8b
|
fix syntax error
|
2014-01-12 13:00:57 -05: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
|
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 |
|
Seth Call
|
72a97198ed
|
* up activerecord in websocket gateway to match web
|
2014-01-11 19:52:30 +00: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 |
|
Seth Call
|
a400c0f289
|
* VRFS-971 adding progress at bottom of fotor
|
2014-01-08 18:04:11 +00:00 |
|
Anthony Davis
|
cd62e07026
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-08 07:04:45 -06:00 |