mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 21:52:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 107 Branches 97 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
764 Commits
Author SHA1 Message Date
Skud 30c1129cab Added route for crop search 2014-01-03 21:28:08 +11:00
Skud 9b278ed05e Added crop search form to header 2014-01-03 21:26:35 +11:00
pozorvlak 06f1d9cb7e Merge pull request #338 from Skud/crop-mentions 
Crop mentions
 2014-01-02 03:16:40 -08:00
Miles Gould 18ccb0d9fb Merge branch 'dev' into harvest-parts 
Conflicts:
	spec/models/harvest_spec.rb
 2013-12-03 13:25:18 +00:00
Skud 11e7055497 Improved case (in-)sensitivity in tests 2013-11-11 11:11:35 +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
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
Skud f90da16cb1 Added plant part to harvest form 2013-10-29 17:29:01 +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 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 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 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 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 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 37383ba451 rails g scaffold Harvest... 2013-09-17 15:39:25 +10:00
Skud faea1904c2 Added referral code search to admin forms 2013-09-13 13:47:46 +10:00
Skud 0ce821aacf added referral_code to order form/checkout code 2013-09-13 13:12:11 +10:00
Skud 995f9b2d60 Display crop hierarchy (recursively!) 2013-09-02 12:01:58 +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
Skud ffeda3007a added help text/links to planting form 2013-08-30 16:37:59 +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
Miles Gould 2c6e2ee2d7 Merge branch 'dev' into places2 
Conflicts:
	app/views/members/_popover.html.haml
 2013-08-28 13:02:25 +01:00
Skud 16f4e153f2 Made admin/newsletter page with list of subscribers 2013-08-27 21:49:54 +10:00
Skud 290535b557 Add newsletter subscription checkbox 2013-08-27 21:22:35 +10:00
Skud 475a402133 Refactor ALL THE THINGS 
Refactored tests to take into account that plantings now have owners
directly, not via gardens. Mostly this was just tweaking FactoryGirl
calls to do the right thing.
 2013-08-26 12:17:23 +10:00
Miles Gould 60ddc82d9f Credit OpenStreetMap under ODbL. 
- broke map attributions into a partial
 2013-08-23 14:36:30 +01:00
Miles Gould 7857bfd0df Merge branch 'dev' into places2 
Fix up broken indentation on navbar.
Conflicts:
	app/views/layouts/_header.html.haml
 2013-08-23 13:29:37 +01:00
Skud 4cdb571e27 Merge pull request #284 from Skud/wrangler-homepage 
added a basic crop wrangler homepage
 2013-08-21 21:54:04 -07:00
Skud 9df8ec15ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into member-bio 
Conflicts:
	db/schema.rb
 2013-08-22 13:15:02 +10:00
Skud 3e84d47c90 fixed bug with tradable_to reverting to 'nowhere' 2013-08-21 21:57:43 +10:00
Skud 8f7becfa78 added a basic crop wrangler homepage 2013-08-21 21:24:22 +10:00
Skud 836ed7aa85 Added creator to scientific name views etc 2013-08-21 17:52:10 +10:00
Skud 57fe663675 Merge branch 'dev' of https://github.com/Growstuff/growstuff into places2 
Conflicts:
	app/controllers/members_controller.rb
	app/models/member.rb
	app/views/members/_popover.html.haml
	spec/models/member_spec.rb
 2013-08-21 17:35:31 +10:00
martyhines 098595721b Added crop creator to crop edit form 2013-08-20 21:46:22 -04:00