 Seth Call
|
3d453468f2
|
* adding ability to run everything within jam-web for jobs
|
2014-01-29 13:24:34 -06:00 |
|
Seth Call
|
873037101c
|
* removing errant m VRFS-1027
|
2014-01-29 11:05:01 -06:00 |
Brian Smith
|
374a9da957
|
VRFS-986 landing page dev complete
|
2014-01-28 02:35:35 -05:00 |
|
Brian Smith
|
1463866c75
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-26 16:46:46 -05:00 |
|
Brian Smith
|
998ebfdc6c
|
VRFS-986 landing page sidebar complete / session landing fixes
|
2014-01-26 16:46:41 -05:00 |
|
Seth Call
|
708da1fb70
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-26 14:46:23 -06:00 |
|
Seth Call
|
8f5a2a6369
|
* tell NOKOGIRI to use system libraries in build environment
|
2014-01-26 14:46:11 -06:00 |
|
Seth Call
|
576e8deeee
|
* fixing recursion bug in eventmachine.rb
|
2014-01-26 19:51:56 +00:00 |
Daniel Weigh
|
a7f10d8141
|
VRFS-930 Musician fixes
VRFS-931 Band fixes
Allows for (temporary?) hiding of buttons when FOLLOW is clicked.
|
2014-01-26 13:44:06 -05:00 |
|
Daniel Weigh
|
b98e6439d9
|
VRFS-930 Musician fixes
"Oops". removed accidentally committed test text.
|
2014-01-26 13:35:03 -05:00 |
|
Daniel Weigh
|
df748d5f5a
|
VRFS-930 Musician fixes
Addresses horiz. scrollbar in the header
|
2014-01-26 13:32:21 -05:00 |
|
Daniel Weigh
|
f2d0801908
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-26 13:26:01 -05:00 |
|
Daniel Weigh
|
7a782c2197
|
VRFS-930 Musician fixes
|
2014-01-26 13:25:34 -05:00 |
|
Daniel Weigh
|
31a18a1f95
|
VRFS-931 Band tweaks
|
2014-01-26 13:25:19 -05:00 |
|
Seth Call
|
d23ca37a82
|
* fix for VRFS-1023; bugsnag preventing rails from starting
|
2014-01-25 21:07:39 -06:00 |
|
Seth Call
|
a26b93a54b
|
* adding requires bugsnag in needed locations to fix VRFS-1023- jam-web won't start
|
2014-01-25 17:48:17 -06:00 |
|
Seth Call
|
ad1521c98b
|
* VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec
|
2014-01-25 17:38:03 -06:00 |
|
Seth Call
|
d93d27db52
|
* trying to disable testsgg
|
2014-01-25 16:48:24 -06:00 |
|
Seth Call
|
bf7b09e820
|
* marking a few tests as pending
|
2014-01-25 16:23:57 -06:00 |
|
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
|
191b9c8756
|
VRFS-1020 add dividers to share dialog
|
2014-01-25 14:32:40 -05:00 |
|
Brian Smith
|
73875a4950
|
merge develop
|
2014-01-25 13:26:56 -05:00 |
|
Brian Smith
|
8c4296096c
|
VRFS-1020 share dialog work
|
2014-01-25 13:25:27 -05:00 |
|
Brian Smith
|
dcea238631
|
VRFS-1020 share dialog work
|
2014-01-25 10:37:15 -05: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
|
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
|
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
|
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
|
09d84b4c11
|
VRFS-986 landing page work
|
2014-01-18 15:32:39 -05:00 |
|
Seth Call
|
8644f4cbc3
|
* VRFS-1006 admin pages added to icecast
|
2014-01-17 19:55:26 +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
|
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
|
1f37b9881f
|
* parameterizing email configs and trying to speed up build on server
|
2014-01-14 16:55:34 -06:00 |
Jonathan Kolyer
|
84360ea642
|
Merge branch 'vrfs152' into develop
|
2014-01-14 14:07:20 -06:00 |