mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-17 12:38:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 59 Branches 82 Tags
Layout/HashAlignment
Commit Graph

2432 Commits

Author SHA1 Message Date
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
1b85326549 Test that only admins can manage plant parts. 2013-10-31 00:02:59 +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
eb8497e1fb Add RSS link to crops index page 2013-10-31 09:25:23 +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
f90da16cb1 Added plant part to harvest form 2013-10-29 17:29:01 +11:00
Skud
721692277d Added plant_part validation to harvest model 2013-10-29 17:17:12 +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
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
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
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
2c8f0687e5 Added posts and comments RSS links 2013-10-23 12:06:04 +11:00
Miles Gould
9c5b6f6192 Rename Crop.system_name to Crop.name 2013-10-18 11:52:05 +01:00
Skud
219b6e3bbc Merge pull request #326 from Skud/harvests 
Harvests
 2013-10-01 19:20:43 -07:00
Skud
7d2cadce83 Added 'harvest this' link to crop page 2013-10-02 10:18:23 +10:00
Skud
668cb33f15 Added more units for harvests 2013-10-01 12:35:41 +10:00
Skud
c23f27e8b0 Added CSV for seeds 2013-09-25 17:15:42 +10:00
Skud
013234c882 Added CSV for plantings 2013-09-25 16:57:27 +10:00
Skud
0116547c96 added links to CSV and JSON data 2013-09-25 16:23:58 +10:00
Skud
c452d38717 If quantity == 0, set it to nil 2013-09-25 16:07:22 +10:00
Skud
c5e8e4298f Separated informal/human units from measured weights 2013-09-25 15:39:17 +10:00
Skud
c3c3c435d5 improve display of quantities 2013-09-23 10:03:08 +10:00
Skud
c63fc97736 Validate quantity/unit for harvests 
If quantity is blank, we also set unit to blank.
 2013-09-17 17:56:00 +10:00
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
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
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
b39df447b6 Merge pull request #307 from Skud/places3 
Places - finally fixed?
 2013-09-10 21:00:54 -07:00
Skud
80b9285727 reinstate @place instance variable for title 2013-09-11 13:19:51 +10:00
Skud
138318e5f4 Moved searching for nearby members into the model 2013-09-11 13:14:52 +10:00
Skud
995f9b2d60 Display crop hierarchy (recursively!) 2013-09-02 12:01:58 +10:00
Skud
4dbfecd315 Added toplevel scope for crops without a parent 2013-09-02 11:52:01 +10:00
Skud
772eec77a7 added routes and controller stuff for crop hierarchy 2013-09-02 11:13:02 +10:00
Miles Gould
4701bd1b2e Merge branch 'dev' into places2 
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
 2013-08-31 15:49:30 +01:00
Miles Gould
d9cb1cba89 Merge branch 'bulb' into dev 2013-08-30 12:01:43 +01:00