Commit Graph
941 Commits
Author SHA1 Message Date
Skud 2f8e060b49 added plantings, seeds, and harvests to the crops JSON 2014-06-30 10:56:58 -07:00
Skud 5d587af8b0 replaced cloudmade maps with mapbox 2014-06-02 18:57:03 -05:00
Skud 1d71afdb2f Added roots/tubers to the CSV output
Also rearranged their order on the planting form to put it nearer bulbs
2014-05-30 11:05:33 -05:00
Mackenzie Morgan 062add32dc Add 'root/tuber' to 'planted from:' list, for things like potatoes 2014-05-04 22:46:45 -04:00
Skud b61bbc2170 moved mailchimp settings to figaro 2014-04-29 13:11:57 +10:00
Skud 2cd5b1d2ed Changed one config setting (site name) over to figaro
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
2014-04-29 12:57:16 +10:00
Skud 1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search
Conflicts:
	spec/models/crop_spec.rb
2014-04-29 11:16:20 +10:00
Skud b86014b04f attempting to fix libv8 problem occurring on heroku 2014-04-28 13:02:23 +10:00
Skud 66a7dca5ab apparently leaflet.ie isn't a thing any more?
https://github.com/Leaflet/Leaflet/issues/2159
2014-04-28 12:54:07 +10:00
Skud 14318ec235 Merge pull request #342 from pozorvlak/harvest_grams
Allow harvesting non-integer quantities.
2014-04-28 11:02:08 +10:00
Miles Gould 79f96f5ef4 Insist that crops created by db:seed are new.
This shaves 2s off the 22s runtime of `rake db:seed` on my machine.
2014-01-10 18:11:27 +00:00
Miles Gould deb706607e Explain step="any" in harvest _form view. 2014-01-05 12:27:10 +00:00
Miles Gould 96675e2eca Allow harvesting non-integer quantities.
Some browsers (grrr Firefox for Android grrrr) assume "number" means
"integer" unless you specify `step="any"`. Perhaps the developers were
inspired by Kronecker?
http://mathoverflow.net/questions/34445/meaning-of-kroneckers-comment-to-lindemann

This was reported as a bug for non-integer weights; I've allowed
non-integer quantities in the other field, because some allowable units
(eg litres) are obviously divisible.
2014-01-03 21:03:01 +00:00
Skud aa07928f1f Show crop thumbnails on search results page 2014-01-03 22:56:31 +11:00
Skud 47f182193f Added sexy search button to navbar search box 2014-01-03 22:48:06 +11:00
Skud 4ce071a0df Fixed a bug that was deleting crops from the database!
Best bug of the night. TIL: don't call delete on an activerecord
collection expecting it to act like an array. D'oh!
2014-01-03 22:47:18 +11:00
Skud 0a3ecdc5ad Added crop search controller and views 2014-01-03 22:29:44 +11:00
Skud addd9cbddf Added search method to crops
For now it just does a naive SQL LIKE query. We can make this fancier in
future, if we want to.
2014-01-03 21:50:41 +11:00
Skud 30c1129cab Added route for crop search 2014-01-03 21:28:08 +11:00
Skud 9b278ed05e Added crop search form to header 2014-01-03 21:26:35 +11:00
pozorvlak 06f1d9cb7e Merge pull request #338 from Skud/crop-mentions
Crop mentions
2014-01-02 03:16:40 -08:00
Miles Gould 338a7512e8 Explain reordering of plant_parts in a comment. 2014-01-02 11:04:57 +00:00
Miles Gould 18ccb0d9fb Merge branch 'dev' into harvest-parts
Conflicts:
	spec/models/harvest_spec.rb
2013-12-03 13:25:18 +00:00
Miles Gould 2a260abf05 Fix Postgres problem with PlantParts#crops
Postgres complains if the ORDER BY clause of a SELECT DISTINCT query is
not precisely one of the SELECTed fields. The default sort order on
crops is lower(name), and Postgres is not smart enough to notice that it
can calculate this from fields which are selected. The solution is to
override PlantParts#crops to remove the ORDER BY clause, and replace it
with `ORDER BY name`. This is not perfect, because it means the crops
associated to plant parts will not be sorted in the same order as crops
on the rest of the site.
2013-12-03 12:56:57 +00:00
Skud 9c899e80a3 Updated help text for markdown 2013-11-11 11:11:12 +11:00
Skud 8620236cb0 Use growstuff markdown everywhere (except policy) 2013-11-11 10:33:20 +11:00
Skud ce7bf82336 Make growstuff markdown actually work 2013-11-11 10:20:52 +11:00
Skud c575638962 Added harvests and plant parts to crops CSV 2013-11-06 12:00:36 +11:00
Skud 5afaea90b9 Added plant part to harvest CSV 2013-11-06 11:23:52 +11:00
Skud 60eb4c7296 Show aggregate 'grown from' data on crop page 2013-11-06 11:21:08 +11:00
Skud 838f3c6e36 Add plant parts to harvest views 2013-11-06 10:45:03 +11:00
Skud a1ea1fd9c1 prettify plant part views 2013-11-06 10:39:32 +11:00
Skud ba27bb6490 plant parts have crops through harvests 2013-11-06 10:38:50 +11:00
Skud ac5027ec27 Can't delete plant parts that are being used 2013-11-06 10:38:28 +11:00
Miles Gould 084bdc4f40 Add friendly URLs to plant parts. 2013-10-31 00:19:48 +00:00
Miles Gould e9a3c0f4ee rails g scaffold PlantPart...
Also migration to remove the string plant_part.
2013-10-30 23:32:20 +00:00
Skud 94cb16acbd List inactive gardens separately 2013-10-31 09:29:38 +11:00
Skud eb8497e1fb Add RSS link to crops index page 2013-10-31 09:25:23 +11:00
Skud 315da26542 Don't show garden location if blank 2013-10-31 09:23:39 +11:00
Skud 26bd744d31 Improve help wording for garden location 2013-10-31 09:18:38 +11:00
pozorvlak 85f132edff Merge pull request #335 from Skud/crop-harvests
Show harvests on crop page
2013-10-29 04:31:27 -07:00
Skud 40eac92013 Moved help text so it flows more nicely 2013-10-29 17:33:02 +11:00
Skud 5302dd58b1 Added pollen as a harvestable plant part 2013-10-29 17:31:16 +11:00
Skud f90da16cb1 Added plant part to harvest form 2013-10-29 17:29:01 +11:00
Skud 7a5bfa5e07 Added 'other' and 'whole plant' to harvestable plant parts 2013-10-29 17:28:51 +11:00
Skud 721692277d Added plant_part validation to harvest model 2013-10-29 17:17:12 +11:00
Skud f89c5e5b86 Added plant_part attribute to harvest 2013-10-29 17:00:32 +11:00
Skud 9917b3a489 Show harvests in crop page sidebar
Also tweaked seed display to make them more consistent.
2013-10-29 16:23:17 +11:00
Skud 8dcd3932fa Added a partial to display a member's location. 2013-10-29 16:22:48 +11:00
Skud 0ae0e54369 Sort harvests by created_at DESC 2013-10-29 15:17:01 +11:00