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
948cb37d26
Specify ruby version for heroku's benefit
2013-11-23 15:56:07 +11:00
Skud
06b8740f58
Specify ruby version for heroku's benefit
2013-11-23 15:34:42 +11:00
Skud
21c10e09ab
upgrade ruby version on heroku due to vulnerability
2013-11-23 15:31:40 +11:00
Skud
9da92c8f71
Make growstuff HAML extensions case insensitive
2013-11-11 11:18:14 +11:00
Skud
11e7055497
Improved case (in-)sensitivity in tests
2013-11-11 11:11:35 +11:00
Skud
9c899e80a3
Updated help text for markdown
2013-11-11 11:11:12 +11:00
Skud
076db6dd07
Use growstuff markdown in RSS feeds
2013-11-11 10:33:35 +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
3a162e9b31
Fixed broken tests for markdown filter
2013-11-08 12:55:47 +11:00
Miles Gould
4add2f3dcf
s/system_name/name
2013-11-07 12:03:43 +00:00
Skud
f3779cd2c9
Quick links to crop pages in Markdown.
2013-11-07 11:43:25 +00: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
435cb4aed9
remove annoying scaffold-generated tests
2013-11-06 10:39:19 +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
1b85326549
Test that only admins can manage plant parts.
2013-10-31 00:02:59 +00:00
Miles Gould
f723fea4e2
Load plant parts in db:seed and rake task.
2013-10-30 23:49:34 +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
pozorvlak
23d9229d73
Merge pull request #336 from Skud/quicktweaks
...
Quick tweaks
2013-10-30 15:46:51 -07: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
pozorvlak
91e0ba92de
Merge pull request #334 from Skud/harvest-bugs
...
Harvest bugs
2013-10-29 04:31:04 -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
Skud
3494651685
Fixed quantity display bug
2013-10-29 15:02:32 +11:00
Skud
795dc0923f
Merge pull request #333 from Skud/garden-inactive
...
New fields for gardens
2013-10-25 06:45:25 -07:00
Skud
faf0ed39d6
actually this is a slightly better fix
2013-10-26 00:44:30 +11:00
Skud
d49a9e28e4
Fixed broken test
2013-10-26 00:35:38 +11:00
Skud
e26544f5ad
Added owner link to the garden page
2013-10-25 23:51:08 +11:00
Skud
b63c854b16
Set default garden locations
...
Also created a handy rake task to depopulate Null Island (i.e. fix up
anyone's lat/long that's somehow ended up as 0,0).
2013-10-25 23:45:48 +11:00
Skud
86aae6534b
Default garden location to the owner's location, if known
2013-10-25 23:25:23 +11:00
Skud
1798696a7b
Don't allow planting in inactive gardens
2013-10-25 23:07:48 +11:00
Miles Gould