mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-13 02:27:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 61 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Skud
60392c30ce Only list active gardens in planting form 2013-10-25 23:05:22 +11:00
Skud
dcf5855643 Added new fields to gardens index 2013-10-25 23:01:23 +11:00
Skud
aee0adde43 Added active/inactive scopes 2013-10-25 22:58:40 +11:00
Skud
96b5a6cd94 Added new garden fields to gardens/show 2013-10-25 22:48:02 +11:00
Skud
aee35aeeca Added new fields to garden form 2013-10-25 22:32:40 +11:00
Skud
803f8244c9 Added various fields to garden 
- active (default: true)
- location, latitude and longitude (because when you move house, you
    don't take your garden with you)
- area and area units (square feet or metres)
 2013-10-25 21:54:13 +11:00
Skud
0aa0c38f1f Removed intentional errors accidentally left in when testing better_errors 2013-10-25 12:34:13 +11:00
Skud
52716df6e9 Fixing up confused crop names from two recent pull requests 2013-10-25 12:26:58 +11:00
Skud
a25ba32476 Merge branch 'system_name_to_name' of https://github.com/pozorvlak/growstuff into pozorvlak-system_name_to_name 
Conflicts:
	db/seeds.rb
 2013-10-25 12:14:01 +11:00
Skud
22df0a43fd Merge pull request #328 from Skud/crop-csv-upload 
Crop csv upload
 2013-10-24 18:07:09 -07:00
Skud
3b29efb828 Merge pull request #329 from pozorvlak/better_errors 
Turn on better_errors in development.
 2013-10-24 18:06:59 -07:00
Skud
f1368d39bb Merge pull request #332 from Skud/rss-links 
Added posts and comments RSS links
 2013-10-24 18:06:44 -07:00
Skud
2c8f0687e5 Added posts and comments RSS links 2013-10-23 12:06:04 +11:00
Skud
bc03252ffa Merge pull request #331 from Skud/rails_12factor 
Added rails_12factor gem to suppress heroku messages
 2013-10-21 20:33:54 -07:00
Skud
142df2ebad Added rails_12factor gem to suppress heroku messages 2013-10-22 14:30:05 +11:00
Miles Gould
9c5b6f6192 Rename Crop.system_name to Crop.name 2013-10-18 11:52:05 +01:00
Miles Gould
afa0dbcfa9 Turn on better_errors in development. 2013-10-18 11:03:57 +01:00
Skud
ed01c6fb29 Added some comments/docs to Crop.create_from_csv 2013-10-17 22:49:57 +11:00
Skud
c46e19e43e Load multiple crop CSV files from seeds.rb 
We factored out a Crop.create_from_csv method to avoid duplicated code.

Note: naming convention with db/seeds/crop*.csv is to use a 2-digit
number for ordering.  00 and 10 chosen (with a gap in between) because I
learned to program in BASIC and it seemed like a good idea just in case.
 2013-10-17 22:45:09 +11:00
Skud
a98cb31161 Added rake task to import new crops from CSV 2013-10-17 22:08:54 +11:00
Skud
58bd464bca Merge pull request #327 from Growstuff/dev 
Production push: Harvests
2013-10-15 		2013-10-15 01:20:20 -07:00
Skud
bc3a31a6a3 Merge pull request #325 from Skud/csv 
Fixed error with blank planting/plant_before dates in CSV files
 2013-10-01 19:21:01 -07:00
Skud
219b6e3bbc Merge pull request #326 from Skud/harvests 
Harvests
 2013-10-01 19:20:43 -07:00
Skud
3f71605572 Turned quick links on homepage into buttons 2013-10-02 10:29:45 +10:00
Skud
7d2cadce83 Added 'harvest this' link to crop page 2013-10-02 10:18:23 +10:00