Skud
c21310c4e2
tweaking less versions as heroku is complaining about later ones
2014-04-28 13:11:43 +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
64d96f427f
update travis.yml to use 2.1.1
2014-04-28 12:44:22 +10:00
Skud
74e1e07567
tweaking secret key settings to match what heroku already has
2014-04-28 12:42:23 +10:00
Skud
28c789f85c
Update to ruby 2.1.1 and various gem tweaks to go with it
2014-04-28 12:33:43 +10:00
Skud
d33d0c507b
Upgrade to ruby 2.0.0
2014-04-28 12:08:13 +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
Skud
813b0da6ef
Merge pull request #343 from pozorvlak/seed-transaction
...
Wrap rake db:seed in a transaction.
2014-04-28 11:01:54 +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
c50f345f1c
Wrap rake db:seed in a transaction.
...
This gives about a 30% speedup on my machine (from 30s to 20s). See
http://stackoverflow.com/questions/1711631/how-do-i-improve-the-performance-of-sqlite
2014-01-10 14:10:27 +00:00
Miles Gould
4b88bf80f1
Test for spec=any in harvests/new.
2014-01-05 13:20:07 +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
pozorvlak
06f1d9cb7e
Merge pull request #338 from Skud/crop-mentions
...
Crop mentions
2014-01-02 03:16:40 -08:00
Skud
f45a8b346f
Merge pull request #339 from pozorvlak/harvest-parts
...
Harvest parts
2014-01-02 03:05:56 -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
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