Seth Call
4e9c2377ba
* fix broken pages in admin
2014-05-08 08:04:06 -05:00
Seth Call
57e8860dcb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 14:22:56 -05:00
4d4d04b343
VRFS-1651 - test-www should not use build_number
2014-05-07 08:30:41 -05:00
Seth Call
97269133ba
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 08:03:43 -05:00
1fa9ffcc3f
VRFS-1651 - really no jam_* gems in test-www
2014-05-07 07:40:22 -05:00
fb1d634875
VRFS-1651 - jam_ gem version does not matter for test_www
2014-05-07 07:33:33 -05:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
Seth Call
00a6139cd1
* merged
2014-04-29 14:04:26 +00:00
a7d83064df
VRFS-1576 fixing redirect paths to use active_admin_template
2014-04-23 06:39:49 +00:00
Seth Call
76e63193ca
* fixing some broken tests
2014-04-09 21:11:13 +00:00
e59d9cbe7a
VRFS-1483 email error handling
2014-04-05 18:52:12 +00:00
0987cf2cf8
VRFS-1483 editing batch emails
2014-03-19 16:37:03 +00: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
d6149a3908
* pin rails to 3.x
2014-02-18 04:54:33 +00: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
52f9bde0a3
* taking gon to 5.0.1 for now
2014-02-13 14:19:08 +00:00
Seth Call
652c56dafd
* VRFS-924 haml added
2014-02-11 15:53:20 +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
8f5a2a6369
* tell NOKOGIRI to use system libraries in build environment
2014-01-26 14:46:11 -06:00
Seth Call
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
Seth Call
a7fa73cfb3
* VRFS-801 still working out some mixer devops issues now;
2014-01-13 22:48:55 +00:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
e5d23cc3bd
merge conflicts
2014-01-08 18:45:34 -06:00
Seth Call
83409e9da8
* adding resque gem to Gemfile
2014-01-08 22:55:44 +00:00
9e4995a55b
vrfs-927: carrrierwave integration
2014-01-04 03:15:19 -06: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
9f09674d77
vrfs-774: added geokit-rails and postgres_ext for geocoded user searches
2013-10-28 21:44:14 -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
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
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
Anthony Davis
Jonathan Kolyer
Daniel Weigh