Skud
40ce4ab77b
Validate units (must be one of individual/bunches/kg/lb)
...
Also changed "units" attribute to "unit". Oops, we weren't following the
Rails naming convention.
2013-09-17 17:26:18 +10:00
Skud
ebf6034659
Prettified all the harvest views
2013-09-17 17:09:17 +10:00
Skud
ccb0e42c95
Prettified harvest form
...
Also renamed "notes" to "description" in database
2013-09-17 16:08:41 +10:00
Skud
67b88e8e18
set cancan abilities for harvests
2013-09-17 15:53:51 +10:00
Skud
2196bc8373
Added associations between harvests, crops, and members
2013-09-17 15:51:30 +10:00
Skud
37383ba451
rails g scaffold Harvest...
2013-09-17 15:39:25 +10:00
Skud
3d42e4bce9
Merge pull request #319 from Skud/css-fixes
...
Css fixes
2013-09-16 17:55:17 -07:00
Skud
4e03e5abbd
Merge pull request #318 from Skud/order_referral_code
...
Order referral code
2013-09-16 00:15:50 -07:00
Skud
24255411c9
added dates created/modified to crops csv
2013-09-16 17:04:39 +10:00
Skud
d014343667
A basic implementation of a CSV dump for crops
2013-09-16 15:33:34 +10:00
Skud
9e374779c0
Fixed navbar display CSS
...
1) Made sure padding is applied to the body *only* for the larger screen
sizes (by doing so before the responsive CSS is loaded)
2) Fixed indentation on the footer, which was incorrectly putting it
inside the main body container, and thus making it do this weird
narrowing thing at smaller screen sizes.
2013-09-16 11:09:52 +10:00
Skud
df3254135f
Made li list style dots more specific
...
We set all li elements to use list-style disc, but it was affecting our
navbar. Changed it to use a specific class in the crop hierarchy (where
we actually cared about it).
2013-09-16 10:49:02 +10:00
Skud
ab588bd21b
add referral code to order admin table
2013-09-16 10:39:12 +10:00
Skud
a250bc162f
Fixed up db/schema to remove spurious payments table
2013-09-16 10:22:42 +10:00
Skud
fef92f0d14
Added tests for admin order controller
2013-09-13 14:19:46 +10:00
Skud
faea1904c2
Added referral code search to admin forms
2013-09-13 13:47:46 +10:00
Skud
1adcedb534
moved admin order search into a model method
2013-09-13 13:38:11 +10:00
Skud
0ce821aacf
added referral_code to order form/checkout code
2013-09-13 13:12:11 +10:00
Skud
2422182aa8
Added referral_code to Order
...
Also added validation (alphanumeric), but we're fairly lax about
whitespace and case, and clean up for them if they make minor errors.
2013-09-13 12:14:17 +10:00
Skud
065005395f
Merge pull request #317 from Skud/crop-hierarchy-caching
...
Hotfix: Added caching of full crop hierarchy
2013-09-12 18:30:36 -07:00
Skud
950a333ac7
Merge pull request #316 from Skud/crop-hierarchy-caching
...
Added caching of full crop hierarchy
2013-09-12 18:30:15 -07:00
Skud
8994b5f5fc
Added caching of full crop hierarchy
...
... as that page is really slow to load at present.
2013-09-13 11:24:03 +10:00
Skud
22cb6d2ad5
Merge pull request #315 from Skud/one-more-places-fix
...
(hotfix) Removed deploy script reminders, as no longer necessary
2013-09-12 05:07:21 -07:00
Skud
dbe542f3d2
Merge pull request #314 from Skud/one-more-places-fix
...
Removed deploy script reminders, as no longer necessary
2013-09-12 05:06:32 -07:00
Skud
c64499881d
Removed deploy script reminders, as no longer necessary
2013-09-12 22:05:35 +10:00
Skud
b02091bc00
Merge pull request #313 from Growstuff/dev
...
Production push: places
2013-09-12 05:03:21 -07:00
Skud
32e49355ff
Merge pull request #312 from Skud/one-more-places-fix
...
removed marker bounds on hover
2013-09-12 04:46:35 -07:00
Skud
f753211096
removed marker bounds on hover
2013-09-12 21:44:42 +10:00
Skud
32614da4ea
Merge pull request #311 from Skud/pretty-maps
...
use a different, greener cloudmade tileset for maps
2013-09-11 02:19:58 -07:00
Skud
d345a082c8
use a different, greener cloudmade tileset for maps
2013-09-11 19:19:23 +10:00
Skud
191c86f0d5
Merge pull request #310 from Skud/final-places-fixes-really-truly
...
Final places fixes really truly
2013-09-11 01:22:23 -07:00
Skud
35f3ee8948
limit things-to-map to those with locations (duh)
2013-09-11 18:20:43 +10:00
Skud
e3c736927f
removed spurious debug message from places/index
2013-09-11 18:17:19 +10:00
Skud
8f15b30eb7
Merge branch 'master' of heroku.growstuff:growstuff-dev into dev
...
Conflicts:
app/assets/javascripts/places.js.erb
2013-09-11 18:12:15 +10:00
Skud
f6c6aa1051
Merge pull request #309 from Skud/places3
...
Places - one more try!
2013-09-11 01:10:37 -07:00
Skud
e7436de1e1
Merge branch 'places3' of github.com:Skud/growstuff into places3
...
Conflicts:
app/assets/javascripts/places.js.erb
2013-09-11 18:08:46 +10:00
Skud
7e65af532d
Set Leaflet icon path explicitly.
...
When we tried to deploy maps on staging, we got the following error
message in our Javascript console:
Error: Couldn't autodetect L.Icon.Default.imagePath, set it manually.
... so we did. The end.
2013-09-11 18:05:38 +10:00
Skud
a75ed5090a
Hardcode Cloudmade API key.
...
Ugh, I know. But it's not any less secure than having it out there in
our Javascript, and it turns out Heroku just downright *refuses* to read
it from an environment variable during asset compilation. I even tried
an experimental Heroku addon
(https://devcenter.heroku.com/articles/labs-user-env-compile ) but it
didn't work, so for now let's just do this and get it out there. I'm
sick of messing with it.
2013-09-11 18:03:19 +10:00
Skud
9cd9fa02f6
Merge branch 'master' of heroku.growstuff:growstuff-dev into places3
2013-09-11 17:33:57 +10:00
Skud
8a203deb19
Use experimental user-env-compile heroku addon
...
It seems that heroku generally denies us access to ENV['...'] during asset
compilation. They have reasonably good reasons for this, and yet I don't
know how else we're meant to get at our API keys (other than hardcoding
them into our config files, which we don't want to do).
So, to work around this, I'm recommending the use of the (experimental,
subject to removal/change, sigh) user-env-compile heroku addon. This
lets us use ENV during asset compilation.
For more info see
https://devcenter.heroku.com/articles/labs-user-env-compile
2013-09-11 17:32:31 +10:00
Skud
f929f33844
experimenting with tainted vars, again. revert this later.
2013-09-11 16:58:52 +10:00
Skud
8b65ad5b8f
experimenting with tainted vars. revert this later.
2013-09-11 16:54:03 +10:00
Skud
75d8b472d1
do env vars show up in the js?
2013-09-11 16:47:11 +10:00
Skud
90f3f0e17c
still trying to get cloudmade key working (should be reverted later)
2013-09-11 16:35:20 +10:00
Skud
3582abab73
debugging output for cloudmade key (needs to be reverted later)
2013-09-11 16:29:04 +10:00
Skud
481ef2c4d1
further adventures in finding the cloudmade_key
2013-09-11 16:23:27 +10:00
Skud
541031707f
Merge branch 'master' of heroku.growstuff:growstuff-dev into places3
2013-09-11 16:16:27 +10:00
Skud
67a0af3d87
Moved all ERB processing to the outside of functions
...
I'm not sure if this will do anything or not, but I can't figure out why
else the email address would have been getting inserted by ERB but the
cloudmade key wouldn't be.
2013-09-11 16:14:53 +10:00
Skud
af9023f87e
Merge pull request #308 from Skud/places3
...
Made a config variable for cloudmade_key
2013-09-10 21:28:44 -07:00
Skud
c58a24f851
Made a config variable for cloudmade_key
...
(because the assets pipeline doesn't seem to want to deal direct with
ENV variables.)
2013-09-11 14:26:56 +10:00
Skud