Brian Smith
|
30b13ed538
|
merge develop
|
2014-01-22 21:21:40 -05:00 |
 Seth Call
|
35466433ca
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-22 16:23:46 -06:00 |
|
Seth Call
|
4b13c5c16c
|
* making ubuntu command need sudo, and adding ubuntu template maker
|
2014-01-22 16:23:33 -06:00 |
|
Seth Call
|
7c375278f8
|
* fixing jamadmin pages
|
2014-01-21 20:30:40 -06:00 |
|
Seth Call
|
f91fb27d64
|
* fixing websocket-gateway tests by not deleting icecast server groups table
|
2014-01-21 16:59:29 +00:00 |
|
Seth Call
|
9f86cc62ab
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-21 14:51:12 +00:00 |
|
Seth Call
|
fcec0a776b
|
* icecast working locally on my mac (VRFS-1002)
|
2014-01-21 14:51:03 +00:00 |
|
Brian Smith
|
f4f54f579e
|
VRFS-986 pass recent_history to partial
|
2014-01-21 01:49:45 -05:00 |
|
Brian Smith
|
aa056d53fd
|
VRFS-986 recent history sidebar for landing pages
|
2014-01-21 01:45:51 -05:00 |
|
Brian Smith
|
6660102982
|
VRFS-986 landing page work
|
2014-01-20 09:28:06 -05:00 |
|
Brian Smith
|
eea5cc781e
|
VRFS-986 landing page work
|
2014-01-19 17:23:10 -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
|
13f711754c
|
* suppressing the other failing test on the build server
|
2014-01-19 03:14:00 +00:00 |
|
Seth Call
|
4e05affc77
|
* disabling audiomixer tests until I figure out why it's failing on audiomixer
|
2014-01-19 02:56:35 +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 |
|
Brian Smith
|
cdb47bdd75
|
fix band_session_join protobuf message
|
2014-01-18 21:03:15 -05:00 |
|
Brian Smith
|
09d84b4c11
|
VRFS-986 landing page work
|
2014-01-18 15:32:39 -05:00 |
|
Seth Call
|
f327317ede
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-17 19:55:42 +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 |
|
Seth Call
|
cfa2ba383a
|
* fixing EM test and removing old pending tests
|
2014-01-16 12:37:25 +00:00 |
|
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 |
|
Seth Call
|
ece0b9bf87
|
* suppressing puts to stdout in test runs
|
2014-01-16 03:29:52 +00:00 |
|
Seth Call
|
01e50b45b3
|
* fixes for EventMachine initialization to work in ruby-only context (without web)
|
2014-01-16 02:21:28 +00:00 |
|
Seth Call
|
7d90425864
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-15 22:20:29 +00:00 |
|
Seth Call
|
d39ec9ba34
|
* VRFS-996 - prevent recording info block stop about footer click
|
2014-01-15 22:20:18 +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
|
e9804b0c03
|
* test failing intermittently on the build server-marking pending
|
2014-01-14 22:38:59 -06:00 |
|
Seth Call
|
f6d1869d52
|
* adding folders for the various jobs
|
2014-01-14 21:16:38 -06:00 |
|
Seth Call
|
99a4310508
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-14 16:55:48 -06:00 |
|
Seth Call
|
1f37b9881f
|
* parameterizing email configs and trying to speed up build on server
|
2014-01-14 16:55:34 -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
|
1f31bb3ff5
|
* fixing debian postinstall issue
|
2014-01-14 09:47:30 -06:00 |
Jonathan Kolyer
|
a32697b2e4
|
vrfs1008: fixed typo
|
2014-01-14 03:19:21 -06:00 |
|
Jonathan Kolyer
|
8eb1bbe81d
|
vrfs1008: disabled the autocomplete feature for musician invites
|
2014-01-14 02:58:29 -06:00 |
|
Jonathan Kolyer
|
d2f71dd874
|
Merge branch 'vrfs1008' into develop
|
2014-01-14 02:31:48 -06:00 |
Daniel Weigh
|
4bdd77f171
|
* placeholder scroller for feed.
|
2014-01-21 21:56:35 -05:00 |
|
Daniel Weigh
|
b5a32b0a53
|
VRFS-931 Band tweaks
|
2014-01-21 21:56:03 -05:00 |
|
Daniel Weigh
|
b8a51e9f6c
|
VRFS-930 Musician fixes
|
2014-01-21 21:55:38 -05:00 |
|
Daniel Weigh
|
51c9892c63
|
* lint error cleanup
|
2014-01-21 21:54:39 -05:00 |
|
Jonathan Kolyer
|
91007055a0
|
vrfs1008: fixed updating invites bug
|
2014-01-14 02:29:07 -06:00 |
|
Jonathan Kolyer
|
ea6391e46e
|
vrfs1008: styled the invite dialog box; fixed bug updating invites
|
2014-01-14 01:52:22 -06:00 |
|
Brian Smith
|
59f6e10e55
|
VRFS-986 recording landing page work
|
2014-01-14 02:49:21 -05:00 |
|
Jonathan Kolyer
|
3c6af2e028
|
vrfs1008: sending updated invites
|
2014-01-14 01:31:20 -06:00 |