 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 |
|
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 |
Anthony Davis
|
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 |
|
Anthony Davis
|
cfb6a6133f
|
adding optional 'fog' dependency 'unf' to suppress warnings
|
2013-11-05 20:03:43 -06:00 |
|
Jonathan Kolyer
|
291a3a8ac2
|
vrfs-774: changing country value from USA to US for max_mind_geo support
|
2013-11-03 01:49:10 -06:00 |
|
Jonathan Kolyer
|
9f09674d77
|
vrfs-774: added geokit-rails and postgres_ext for geocoded user searches
|
2013-10-28 21:44:14 -05:00 |
|
Anthony Davis
|
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 |
|
Jonathan Kolyer
|
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 |
|
Jonathan Kolyer
|
712e748218
|
vrfs-768: added check for user_admin_eq in scoped_collection
|
2013-10-10 14:42:40 -05:00 |
|
Jonathan Kolyer
|
c088bd2f57
|
VRFS-575: fixed link creation
|
2013-09-29 22:04:06 -05:00 |
|
Jonathan Kolyer
|
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 |
|
Jonathan Kolyer
|
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 |