mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-11 17:24:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,419 Commits 61 Branches 82 Tags
c76e9ccbf6ff41c192845c723ddc8690a74aede7
Commit Graph

132 Commits

Author SHA1 Message Date
Skud
e0d8126514 Merge pull request #694 from maco/cms 
Add comfortable mexican sofa CMS to growstuff & make footer use it
 2015-02-10 20:53:50 +11:00
Taylor Griffin
cbb4f9d7ac add rejection notes 2015-02-09 22:17:32 +11:00
Mackenzie Morgan
b66b8263c1 resolving schema merge 2015-02-09 00:06:18 -05:00
Skud
f7a2ec2054 Merge pull request #676 from pozorvlak/seed_properties 
New seed properties: days until maturity, organic, GMO, heirloom
 2015-02-09 14:07:20 +11:00
Taylor Griffin
076a6cc1df catch up with upstream dev 2015-02-04 21:41:42 +11:00
Miles Gould
c1870d46a2 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-02 17:45:49 +00:00
Mackenzie Morgan
1f23e1a646 merge from upstream 2015-02-01 22:08:28 -05:00
Taylor Griffin
4211ebec76 add request notes to crop request 2015-02-01 17:56:51 +11:00
Taylor Griffin
e86200b942 requester receives a message when crop request is rejected 2015-02-01 17:32:49 +11:00
Taylor Griffin
c80b42d9bc change from approved boolean to approval_status string 2015-02-01 16:52:31 +11:00
Mackenzie Morgan
6aa37e6e26 adding CMS via comfortable mexican sofa gem 2015-02-01 00:27:04 -05:00
Miles Gould
089a3d5c24 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-01 00:03:10 +00:00
Taylor Griffin
22e0379769 give crops a requester 2015-01-31 09:54:59 +11:00
Mackenzie Morgan
e2bac619b7 Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights 2015-01-28 23:10:10 -05:00
Mackenzie Morgan
0bdab0d9fc basics of harvest standardized weights 2015-01-28 23:00:16 -05:00
Mackenzie Morgan
c38dc4661d basics of garden photos 2015-01-27 00:54:05 -05:00
Miles Gould
233f9dfd88 Split "days until maturity" into min and max fields. 2015-01-26 19:20:33 +00:00
Miles Gould
9a18b4b62b Add new properties to seeds 
Added days_until_maturity, gmo, organic and heirloom properties; added
validation and tests for the last three.
 2015-01-24 11:31:35 +00:00
Yoong Kang Lim
0eb5ae58aa Renamed member_id column in Follow table to follower_id. Made necessary modifications to models and tests. 2014-11-20 00:42:46 +11:00
Yoong Kang Lim
a9fdab5d7c Basic follower relationship 2014-11-12 00:23:01 +11:00
pozorvlak
24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00:00
Miles Gould
e85cb4598d Add alternate name model. 2014-10-18 12:38:44 +01:00
Skud
e4cf636bef Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	app/models/harvest.rb
	db/schema.rb
	spec/models/harvest_spec.rb
 2014-10-15 14:20:16 +01:00
Shiho Takagi
6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Mackenzie Morgan
48ad561b76 convert tabs to spaces 2014-10-01 23:58:54 -04:00
Mackenzie Morgan
fcda8742d8 go back to the nested error handling in the photos controller and add a migration for indexing harvests_photos 2014-10-01 22:52:52 -04:00
Mackenzie Morgan
0ad217c9a2 add index to harvest_photo 2014-10-01 20:16:53 -04:00
Skud
d8b75eaa66 Fixed up db migration and tests for planting reminders 2014-09-28 15:55:55 +10:00
Skud
4a62add88e Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	spec/models/planting_spec.rb
 2014-09-28 15:32:53 +10:00
Mackenzie Morgan
2b7b5bad63 including all the new files needed for harvest photos, this time 2014-09-09 20:21:16 -04:00
Skud
b07d9d8db0 Added finished fields for plantings 2014-08-30 09:27:41 +10:00
Skud
817663bdaf Merge branch 'dev' of https://github.com/Growstuff/growstuff into regularemail 
Conflicts:
	db/schema.rb
 2014-07-20 19:30:20 +10:00
Skud
f67732e125 Added checkbox for whether to send planting reminder 2014-07-20 19:17:59 +10:00
Skud
8223025d35 Set default plantings_count to 0 not nil 2014-07-18 18:06:43 +10: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
f89c5e5b86 Added plant_part attribute to harvest 2013-10-29 17:00:32 +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
Miles Gould
9c5b6f6192 Rename Crop.system_name to Crop.name 2013-10-18 11:52:05 +01:00
Skud
c5e8e4298f Separated informal/human units from measured weights 2013-09-25 15:39:17 +10:00
Skud
9667f43874 Added friendly urls to harvests 2013-09-17 18:02:48 +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
ccb0e42c95 Prettified harvest form 
Also renamed "notes" to "description" in database
 2013-09-17 16:08:41 +10:00
Skud
37383ba451 rails g scaffold Harvest... 2013-09-17 15:39:25 +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
b73c4db17a Merge branch 'newsletter' of https://github.com/Skud/growstuff into Skud-newsletter 
Conflicts:
	db/schema.rb
	spec/models/member_spec.rb
 2013-08-29 00:06:44 +10:00
Skud
290535b557 Add newsletter subscription checkbox 2013-08-27 21:22:35 +10:00
Skud
99bfc704dc Added plantings_count (i.e. counter_cache) to Member 
Also removed the superfluous .plantings_count method on Crop, which was
causing some confusion.

A thing we learned today: we should use .size to find the size of
ActiveRecord collections, not .count, because .count doesn't use the
cache (while .size does).
 2013-08-26 13:54:09 +10:00
Skud
1ad416269d Added owner to planting 
Previously we got the owner indirectly, through the garden in which the
planting was planted.  Now we're directly specifying an owner.  This
allows us to let people plant things in each other's gardens.

Tests are probably broken at this point; we're about to refactor ALL THE
THINGS.
 2013-08-26 12:17:06 +10:00