mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 19:54:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 101 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Griffin e86200b942 requester receives a message when crop request is rejected 2015-02-01 17:32:49 +11:00
Taylor Griffin 776b5450f9 requester receives email when crop request is approved 2015-02-01 17:20:48 +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
Miles Gould 1741567e19 Add tests for display of date ranges. 
They fail for me with the error

undefined method `days_until_harvest_min=' for #<Seed:0x0000000b8dfcd8>
 2015-01-31 23:59:27 +00:00
Mackenzie Morgan de5b16e384 back to kg for si weight, also now adding si_weight to the csv correctly 2015-01-31 18:35:29 -05:00
Taylor Griffin a8c203aea0 send emails to all crop wranglers when a new crop is requested 2015-02-01 09:32:50 +11:00
Marlena Compton a013385d35 add bits to get the labels in the right place 2015-01-31 08:02:51 -08:00
Shiho Takagi 2aa30475e9 merge 2015-02-01 00:14:52 +11:00
Shiho Takagi 9a5e15b292 index when sci name or alt name is updated 2015-01-31 23:59:46 +11:00
Mackenzie Morgan bb9695b272 add check for nil to set_si_weights and the corresponding deploy script and update test 2015-01-31 00:45:31 -05:00
Mackenzie Morgan d436fd86f8 use ruby-units to handle conversion. note: the deploy task isn't working and i don't know why 2015-01-31 00:22:35 -05:00
Mackenzie Morgan 3f393b0937 moving si_weight population to one-off 2015-01-30 23:17:42 -05:00
Mackenzie Morgan fb271633d9 Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights 2015-01-30 22:48:50 -05:00
Taylor Griffin e40fad76fd exclude pending approval crops from default crops scope 2015-01-31 10:39:17 +11:00
Taylor Griffin 41db12d8d7 pending approval crops appear on crops wrangle page 2015-01-31 10:36:02 +11:00
Taylor Griffin 28d29291a7 any member can create a crop at least provisionally 2015-01-31 10:03:44 +11:00
Taylor Griffin 22e0379769 give crops a requester 2015-01-31 09:54:59 +11:00
pozorvlak b60bbbcb4e Merge pull request #682 from maco/dev 
fixing harvest csv so it doesn't error
 2015-01-30 15:54:58 +00:00
Mackenzie Morgan 0da121a48d adding test for harvest csv 2015-01-29 22:27:09 -05:00
Skud 6b6ffd6e58 Merge pull request #653 from rocky-jaiswal/issues/625_add_context_for_logged_out_users 
Show friendly message to unregistered users who view posts.
 2015-01-30 12:37:48 +11:00
Rocky Jaiswal 21dbf87ab9 Merge branch 'issues/625_add_context_for_logged_out_users' of github.com:rocky-jaiswal/growstuff into issues/625_add_context_for_logged_out_users 2015-01-29 12:03:40 +01:00
Rocky Jaiswal a5fcd9f860 Merge branch 'dev' of github.com:Growstuff/growstuff into issues/625_add_context_for_logged_out_users 2015-01-29 12:03:27 +01:00
Rocky Jaiswal 2853bf5c70 Merge pull request #1 from Skud/rocky-jaiswal-issues/625_add_context_for_logged_out_users 
Rocky jaiswal issues/625 add context for logged out users
 2015-01-29 12:02:19 +01:00
Mackenzie Morgan 2d55d88db8 fixing harvest csv so it doesn't error 2015-01-29 00:49:23 -05: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
Skud e55fe55dc7 Merge pull request #680 from maco/garden_photos 
Garden photos
 2015-01-29 09:48:39 +11:00
Marlena Compton ba7ef3c85d all charts tests passing WOOT 2015-01-28 05:16:23 -08:00
Mackenzie Morgan 5a474d523c merge from upstream 2015-01-27 22:35:19 -05:00
Marlena Compton 73e144278e added chart to the page 2015-01-27 07:26:31 -08:00
Mackenzie Morgan d126392ee2 display garden photos on member page garden tabs too 2015-01-27 00:58:44 -05:00
Mackenzie Morgan c38dc4661d basics of garden photos 2015-01-27 00:54:05 -05:00
Mackenzie Morgan 675ac5a03f add before_save for harvest weight and index for harvest photos 2015-01-26 22:26:21 -05:00
Miles Gould 233f9dfd88 Split "days until maturity" into min and max fields. 2015-01-26 19:20:33 +00:00
Shiho Takagi b414598b07 adding comments for search options 2015-01-26 22:50:47 +11:00
Shiho Takagi 2c4e768a3a fixing wrong file name 2015-01-26 22:30:19 +11:00
Marlena Compton e3d2a90af8 all tests by the y test is passing 2015-01-25 12:45:36 -08:00
Shiho Takagi 04d61bd040 deployment sript 2015-01-25 16:18:26 +11:00
Shiho Takagi 5a96b7efd6 adding a rake task to generate elasticsearch index 2015-01-25 15:47:40 +11:00
Marlena Compton 1d5466fdfd all but one test passing and seeing that I need a how separate y scale 2015-01-24 16:23:09 -08:00
Miles Gould 329e147add Show new seed props in detail page 2015-01-24 12:34:14 +00:00
Miles Gould 334b5bf63f Test new seed properties on detail page 2015-01-24 12:34:09 +00:00
Miles Gould 58940a6765 Add new seed properties to feature. 2015-01-24 12:13:57 +00:00
Miles Gould 2442539e1b Allow feature tests and unicorn to run at the same time 2015-01-24 12:08:02 +00:00
Miles Gould b56237115e Add form and controller for new seed properties 2015-01-24 12:01:11 +00:00
Miles Gould 038192095d Validate all numeric fields as being >= 0. 2015-01-24 11:54:17 +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