mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 13:41:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,419 Commits 62 Branches 76 Tags
c76e9ccbf6ff41c192845c723ddc8690a74aede7
Commit Graph

217 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
Taylor Griffin
2db7bf638b improve copy for new request email 2015-02-09 20:41:28 +11:00
Mackenzie Morgan
b66b8263c1 resolving schema merge 2015-02-09 00:06:18 -05:00
Mackenzie Morgan
c3429cc0f3 adding admin access test for cms, and changing the cms admin path, and adding a link for it to the admin page, and updating the navbar so i can actually target the sign-in link in the test. also removing sample fixture gencode from cms installation 2015-02-09 00:05:02 -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
robertlandreaux
b78ccaa097 fix crop_wrangling_button_spec.rb 2015-02-06 21:57:47 -05:00
Taylor Griffin
076a6cc1df catch up with upstream dev 2015-02-04 21:41:42 +11:00
Mackenzie Morgan
075cdb8272 Merge branch 'dev' of github.com:growstuff/growstuff into cms 2015-02-02 23:11:51 -05:00
Miles Gould
c1870d46a2 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-02 17:45:49 +00:00
Skud
af39df5e0c Fixed test failure if elasticsearch isn't present in test env 2015-02-02 18:20:16 +11: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
2567e7cd74 adding tests (not passing, need to figure out saving mid-test), fixing before_save, adding CSV column, and adding task to set the si_weight throughout the db 2015-01-29 00:27:53 -05: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
Taylor Griffin
0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00
Taylor Griffin
3c360ab1b8 specify permitted params for nested attributes 2015-01-23 09:22:13 +11:00
Taylor Griffin
7bc05fa118 typo 2015-01-12 22:16:42 +11:00
Taylor Griffin
f7af7e649d update comment to reflect code changes 2015-01-12 20:13:00 +11:00
Taylor Griffin
4efb93ea45 don't load test and admin users in staging 2015-01-12 07:48:48 +11:00
Taylor Griffin
02ff45f705 broaden seeding for staging env 2015-01-11 09:41:04 +11:00
Taylor Griffin
8829acba3f removed depricated method 2014-12-14 15:54:43 +11:00
Taylor Griffin
a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Skud
c1bcbd2e7d Fix parent crop for B. oleracea Acephela group 2014-12-03 14:58:46 +11:00
Skud
a47328eed4 Fixed ordering and capitalisation in brassica import 2014-12-03 14:50:25 +11:00
Miles Gould
4b90f6385b Merge branch 'dev' into load_alternate_names 
Conflicts:
	Gemfile.lock
	script/deploy-tasks.sh
 2014-12-01 10:47:10 +00:00
pozorvlak
751a66b49b Merge pull request #457 from Skud/multiple_scinames 
Multiple scientific and alternate names
 2014-12-01 10:33:46 +00:00
Skud
d0b61c259d Added squashes and new crops from London working bee 2014-12-01 21:20:44 +11:00
Skud
82a5379a25 Added mint family and brassica crops (seed files) 2014-12-01 20:53:17 +11:00
Skud
4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +11: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
f795918e17 Remove alternate names for crops without IDs. 2014-10-19 22:49:18 +01:00
Miles Gould
7c3059fcae Fix typo in altname CSV 2014-10-19 22:21:10 +01:00
Miles Gould
06a4fcab71 Remove superfluous* error-checks from load_altnames 
* /me crosses fingers...
 2014-10-19 22:19:41 +01:00
Miles Gould
0aea1721d8 Add altname data and include load in deploy-tasks. 2014-10-19 17:24:18 +01:00
Skud
7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
Skud
864ce95f11 Merge pull request #430 from Skud/tomatoes 
Added some additional hierarchy around cherry tomatoes
 2014-10-18 14:40:02 +01:00
Skud
ae27a0a5b5 Added some additional hierarchy around cherry tomatoes 2014-10-18 14:38:00 +01:00
Miles Gould
e85cb4598d Add alternate name model. 2014-10-18 12:38:44 +01:00