 Seth Call
|
5ba4e97dca
|
* VRFS-1089 - jamadmin creation of recordings done
|
2014-02-13 16:41:50 +00:00 |
|
Seth Call
|
69523e0e07
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-02-13 14:19:29 +00:00 |
|
Seth Call
|
52f9bde0a3
|
* taking gon to 5.0.1 for now
|
2014-02-13 14:19:08 +00:00 |
Jonathan Kolyer
|
fba4e53093
|
VRFS-1037 reverted redirect path on create/update
|
2014-02-11 21:05:09 -06:00 |
|
Jonathan Kolyer
|
479b05c67b
|
VRFS-1037 fixed redirect path on create/update
|
2014-02-11 21:02:51 -06:00 |
|
Jonathan Kolyer
|
3ed657f815
|
VRFS-1037 fixed redirect path on create/update
|
2014-02-11 21:01:06 -06:00 |
|
Seth Call
|
0f0521ccf8
|
* VRFS-152-replace localhost with 127.0.0.1, if present
|
2014-02-11 17:25:03 +00:00 |
|
Seth Call
|
652c56dafd
|
* VRFS-924 haml added
|
2014-02-11 15:53:20 +00:00 |
|
Seth Call
|
184ac3e834
|
* VRFS-924 haml added
|
2014-02-11 15:52:18 +00:00 |
Anthony Davis
|
ce9c379853
|
VRFS-1099 - modfying Buzz/Latests creation
|
2014-02-11 20:35:24 -06:00 |
|
Jonathan Kolyer
|
966075c885
|
VRFS-1034 fixed image uploading for buzz; added UI text instructing user to upload image before editing text
|
2014-02-07 20:26:17 -06:00 |
|
Jonathan Kolyer
|
bf04986e25
|
VRFS-1033 changed column names from {short,long}_text to Who/Quote
|
2014-02-06 13:07:32 -06:00 |
|
Seth Call
|
7661fc5e39
|
* VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog
|
2014-02-07 21:28:47 +00:00 |
|
Seth Call
|
f86d7fbdd5
|
* deal with chuid differently so pre-script works
|
2014-02-05 02:13:41 +00:00 |
|
Seth Call
|
4549282f0d
|
* trying no-https rubygems for a bit, see if it helps build
|
2014-02-04 21:53:37 +00:00 |
|
Seth Call
|
148009ece5
|
* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg
|
2014-02-04 20:28:00 +00:00 |
|
Seth Call
|
103954cb96
|
* VRFS-1074 - create run folders for pids on every upstart start
|
2014-02-04 18:18:15 +00:00 |
|
Seth Call
|
ae8b6ebbc7
|
* renaming all ShareDialog to ShareSessionDialog
|
2014-02-04 17:05:38 +00:00 |
|
Seth Call
|
513fb2b8d4
|
* intsall to vendor/bundle
|
2014-02-02 14:03:31 -06:00 |
|
Jonathan Kolyer
|
da9a001e43
|
fixed issues editing buzz entries
|
2014-02-01 21:59:25 -06:00 |
|
Seth Call
|
7f409c2cb4
|
VRFS-1054 removing reload slush
|
2014-02-01 20:45:58 -06:00 |
|
Seth Call
|
6806d6f0d3
|
* VRFS-1016
|
2014-01-31 14:25:17 -06:00 |
|
Seth Call
|
2e5eb4fd7f
|
* beefing up description in icecast_bootstrap
|
2014-01-30 20:13:09 -06:00 |
|
Seth Call
|
6ccfc4cc08
|
* VRFS-1010 possibly done
|
2014-01-30 15:51:05 -06:00 |
|
Seth Call
|
8f5a2a6369
|
* tell NOKOGIRI to use system libraries in build environment
|
2014-01-26 14:46:11 -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
|
fcec0a776b
|
* icecast working locally on my mac (VRFS-1002)
|
2014-01-21 14:51:03 +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 |
|
Seth Call
|
8644f4cbc3
|
* VRFS-1006 admin pages added to icecast
|
2014-01-17 19:55:26 +00:00 |
|
Seth Call
|
1f37b9881f
|
* parameterizing email configs and trying to speed up build on server
|
2014-01-14 16:55:34 -06: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
|
34b96db2c1
|
* updating nav of jam-admin and adding mixes page
|
2014-01-13 11:24:16 +00:00 |
|
Seth Call
|
f79d3bdd70
|
* fixing bad name in debian scripts from audimxer to audiomixer
|
2014-01-13 11:22:28 +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 |
|
Seth Call
|
1555af6db8
|
* VRFS-984 finished. subpath is /resque
|
2014-01-10 16:25:55 +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 |
|
Jonathan Kolyer
|
bb2024fe19
|
vrfs-927: carrierwave_direct integration
|
2014-01-08 01:04:17 -06:00 |
Chris Doughty
|
d8cb2c72c4
|
VRFS-951 Pushing only develop or master branch files as debians
|
2014-01-05 21:35:22 -06:00 |
|
Jonathan Kolyer
|
9e4995a55b
|
vrfs-927: carrrierwave integration
|
2014-01-04 03:15:19 -06:00 |
|
Jonathan Kolyer
|
7212f20a0f
|
vrfs-927: admin editing buzz promotions
|
2013-12-22 10:19:39 -06:00 |
|
Jonathan Kolyer
|
fa05c3eb5d
|
vrfs737: added user progression admin panel
|
2013-12-21 23:22:54 -06:00 |
|
Seth Call
|
182242c7fb
|
* VRFS-856 - hopefully the fix
|
2013-12-21 15:12:25 +00:00 |
|
Seth Call
|
8deced77c7
|
* pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken
|
2013-12-20 23:44:12 +00:00 |