Seth Call
dae0f40929
* removed is_downloadable for VRFS-1141, from database and UI
...
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
2014-02-22 05:09:39 +00:00
e0ae2e378e
VRFS-1194 changed recording/session drop-down list selection to unique ID text input
2014-02-20 10:01:25 -06:00
ca64966c7f
* duplicate entry
...
$ bundle exec rails server
Your Gemfile lists the gem bcrypt-ruby (= 3.0.1) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the
version of just one of them later.
2014-02-20 00:30:25 -05:00
Seth Call
b21fcd74b2
* allow duration to be specified
2014-02-19 15:15:55 +00:00
Seth Call
6a5c607fed
* remove javascript_include to avoid precompiled error VRFS-1175
2014-02-18 23:43:53 +00:00
Seth Call
d6149a3908
* pin rails to 3.x
2014-02-18 04:54:33 +00:00
cd3b57ef45
changed redirect to use route paths
2014-02-15 18:33:41 -06:00
Seth Call
0300306e1d
* VRFS-1130 - found issue where postback wasn't using ENV['RAILS_RELATIVE_URL_ROOT']
2014-02-15 04:22:48 +00:00
6186e20251
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 01:01:37 -05:00
5d8fac92c6
* fix admin redirect
2014-02-14 01:01:09 -05:00
Seth Call
4d1f24e606
* gon has issue fixed
2014-02-13 23:26:53 -06:00
Seth Call
9e561c047a
* VRFS-1103 - coverage for all projects. need to figure out how to merge all
2014-02-13 22:11:30 -06:00
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
fba4e53093
VRFS-1037 reverted redirect path on create/update
2014-02-11 21:05:09 -06:00
479b05c67b
VRFS-1037 fixed redirect path on create/update
2014-02-11 21:02:51 -06:00
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
ce9c379853
VRFS-1099 - modfying Buzz/Latests creation
2014-02-11 20:35:24 -06:00
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
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
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
401a97d566
Merge branch 'develop' into vrfs927
2014-01-10 18:13:00 -06:00
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
e5d23cc3bd
merge conflicts
2014-01-08 18:45:34 -06:00
785817d299
vrfs-927: added initial promo latest support
2014-01-08 18:38:04 -06:00
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
bb2024fe19
vrfs-927: carrierwave_direct integration
2014-01-08 01:04:17 -06:00
d8cb2c72c4
VRFS-951 Pushing only develop or master branch files as debians
2014-01-05 21:35:22 -06:00
9e4995a55b
vrfs-927: carrrierwave integration
2014-01-04 03:15:19 -06:00
7212f20a0f
vrfs-927: admin editing buzz promotions
2013-12-22 10:19:39 -06:00
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
Seth Call
dc5f5c48a8
* trying to fix admin based on stuff that broke in develop branch on Nov 5
2013-12-18 15:47:02 +00:00
Seth Call
adfc22364a
* fix for VRFS-885
2013-12-05 11:24:30 +00:00
Seth Call
826f89d4f3
* working through all the dependency issues with admin
2013-11-05 20:10:59 +00:00
250933490b
removing 'unf' in admin Gemfile in case it's breaking the build
2013-11-05 22:21:12 -06:00
Seth Call
297bce049d
* working through all the various dependency issues of admin project
2013-11-05 20:06:38 +00:00
cfb6a6133f
adding optional 'fog' dependency 'unf' to suppress warnings
2013-11-05 20:03:43 -06:00
291a3a8ac2
vrfs-774: changing country value from USA to US for max_mind_geo support
2013-11-03 01:49:10 -06:00
9f09674d77
vrfs-774: added geokit-rails and postgres_ext for geocoded user searches
2013-10-28 21:44:14 -05:00
61ae54048a
typos
2013-10-19 23:45:43 -05:00
Seth Call
481514e301
* VRFS-778, VRFS-777, VRFS-788, VRFS-787-to create new downloads page, I needed to add a new layout 'web', and make user dropdown more reusable
2013-10-19 14:46:06 -05:00
Seth Call
7c7eca0964
* fixing up admin tests after changing their menu label
2013-10-16 12:28:44 -05:00
Seth Call
482c2cece3
* VRFS-773 - isp page avaible
2013-10-16 11:20:37 -05:00
db5804d1cf
vrfs-768: changed url param for admin toggle to just admin; added h2 title with instructions for toggling
2013-10-15 09:54:16 -05:00
712e748218
vrfs-768: added check for user_admin_eq in scoped_collection
2013-10-10 14:42:40 -05:00
c088bd2f57
VRFS-575: fixed link creation
2013-09-29 22:04:06 -05:00
eb079464ab
VRFS-575: moved association to perf data from music_session to music_session_user_history; updated admin links for perf data
2013-09-23 12:21:33 -05:00
f7ea752ea4
VRFS-717: fixed sort ordering to use created_at DESC
2013-09-23 11:40:28 -05:00
Seth Call
8b48a97fe2
* updating gitignore
2013-09-22 19:11:47 +00:00
Seth Call
40c8f66e64
* fixing bad constant
2013-09-22 02:18:33 +00:00
Seth Call
6477bbb867
* VRFS-702 - fixing cookie policy page
2013-09-22 01:35:50 +00:00
Seth Call
2b68987dfd
* VRFS-699 - adding bugsnag to jam-admin
2013-09-22 01:30:37 +00:00
Seth Call
b4082c88ae
* bumping gems to be version 0.1.X to match debs
2013-09-18 20:35:20 +00:00
Seth Call
e76fc73595
* VRFS-438 - squirt out BUILD_NUMBER into file and make debian packages reference it when it starts the app so that gem versions can be found
2013-09-16 17:03:26 +00:00
Seth Call
fbb9009fcb
* fix another copy/paste bug in admin build script
2013-09-16 04:27:14 +00:00
Seth Call
1085686970
* fixing jam-admin's build and Gemfile for merging into jam-cloud
2013-09-16 03:19:10 +00:00
Seth Call
c8150c8aee
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
Seth Call
Jonathan Kolyer
Daniel Weigh
Anthony Davis
Chris Doughty