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

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Skud
c6f5abc036 Made info alerts be green like Growstuff is green 2015-01-24 21:07:41 +11:00
Skud
ad76a04e8f Fixed misnamed feature test 2015-01-24 21:07:27 +11:00
Skud
0b70be4939 Merge branch 'issues/625_add_context_for_logged_out_users' of https://github.com/rocky-jaiswal/growstuff into rocky-jaiswal-issues/625_add_context_for_logged_out_users 2015-01-24 20:45:14 +11:00
pozorvlak
da2590791e Merge pull request #665 from pozorvlak/500_on_follow 
Fix the 500 server error when you try to follow another user
 2015-01-23 23:45:03 +00:00
Marlena Compton
a749a9ca63 all tests working but 2 about to monkey with data again 2015-01-23 06:33:03 -08:00
Miles Gould
79a7958519 Don't try to load a Follow before it's been created. 2015-01-23 11:39:20 +00:00
Miles Gould
f4d452f3bc Turn on PhantomJS for Follows features. 2015-01-23 11:39:20 +00:00
Miles Gould
d08e2f09db Add feature test for 500-on-follow error 
This doesn't actually catch the problem; I'm committing it so other
people can see it and suggest ways of making it stronger.
 2015-01-23 11:39:20 +00:00
pozorvlak
d5cc3f300a Merge pull request #664 from pozorvlak/travis_containers 
Deployment from Travis containers
 2015-01-23 11:00:11 +00:00
Skud
1982cecc31 Merge pull request #673 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-23 13:40:47 +11:00
Taylor Griffin
2f05f1dbdb raise exceptions on unpermitted params in staging 2015-01-23 13:22:52 +11:00
Taylor Griffin
a67a55c599 add scientific name to crops create feature spec 2015-01-23 13:21:47 +11:00
Taylor Griffin
253b5a3f85 define permitted param for nested attribute 2015-01-23 13:20:37 +11:00
Taylor Griffin
45aaf31722 Merge branch 'dev' of https://github.com/Growstuff/growstuff into sci-names-permitted-params 2015-01-23 13:19:33 +11:00
Taylor Griffin
d0b9917e84 Merge pull request #671 from Growstuff/revert-669-sci-names-permitted-params 
Revert "Sci names permitted params"
 2015-01-23 13:14:42 +11:00
Taylor Griffin
32dcacf9ba copy schema from last known correct version 2015-01-23 13:14:13 +11:00
Taylor Griffin
0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00
Miles Gould
6d1385f00c Turn on PhantomJS for all feature tests. 2015-01-22 23:55:20 +00:00
pozorvlak
dabfeeea3c Merge pull request #669 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-22 23:46:27 +00:00
Taylor Griffin
20b9996f14 raise exceptions on unpermitted parameters in staging 2015-01-23 10:15:06 +11:00
Taylor Griffin
1ea5257da4 include sci names in create crop feature spec 2015-01-23 09:56:23 +11:00
Taylor Griffin
3c360ab1b8 specify permitted params for nested attributes 2015-01-23 09:22:13 +11:00
pozorvlak
b1c60572ef Merge pull request #668 from cesy/moretests 
More tests
 2015-01-22 22:01:23 +00:00
Cesy Avon
14ad572f18 Adding test for products 2015-01-22 16:21:10 +00:00
pozorvlak
1481d01cf8 Merge pull request #667 from cesy/moretests 
More tests
 2015-01-22 15:42:11 +00:00