mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-31 11:21:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 89 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
488 Commits
Author SHA1 Message Date
Brenda Wallace 83392ddda1 Indentation clean ups 2016-11-26 10:51:54 +13:00
Brenda Wallace 5e0cff5b8e Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces 
Conflicts:
	app/helpers/seeds_helper.rb
	spec/support/controller_macros.rb
 2016-11-17 19:04:44 +13:00
Brenda Wallace 5ec2877577 Covert all tabs to spaces 2016-11-16 13:18:26 +13:00
Brenda Wallace 6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Brenda Wallace 0475954acf Removed extra blank lines 2016-11-16 12:50:14 +13:00
Brenda Wallace bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Daniel O'Connor d3dac756d6 Merge remote-tracking branch 'upstream/dev' into likeable 2016-07-09 21:08:33 +09:30
Daniel O'Connor 944349760a Fix DEPRECATION WARNING: #timestamps was called without specifying an option for null. 
In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing
 2016-06-10 15:57:48 +09:30
Daniel O'Connor bb25cbe5e2 Merge branch 'dev' of github.com:Growstuff/growstuff into likeable 2016-06-04 21:00:52 +09:30
Daniel O'Connor 4b4e0cf69a $ rubocop --only HashSyntax --auto-correct 
483 files inspected, 2018 offenses detected, 2018 offenses corrected
 2016-05-19 15:53:11 -04:00
Daniel O'Connor 859cf7f215 #509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic 2015-08-25 00:32:17 +09:30
Daniel O'Connor 6d97a060c3 #509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic 2015-08-25 00:32:06 +09:30
Anthony Atkinson a80001ffe7 Schema update after migration. 2015-07-22 10:39:02 -04:00
AELOGICA 3181c97a2a Added the mark as finished button on the index page. 2015-07-07 08:20:42 +08:00
AELOGICA 372a7f080d Added the days before maturity feature #678 2015-07-07 08:20:42 +08:00
Shiho Takagi d95bd0e063 Skip all user confirmation 2015-04-04 23:22:21 +11:00
Shiho Takagi 0c80a00f31 Pupulate sunniness and planted_from field on planting. 2015-04-04 22:56:35 +11:00
Shiho Takagi 59d823ff8b bulk creating members, gardens and plantings 2015-03-17 02:07:43 +11:00
Yoong Kang Lim 75ac2081b0 Merge branch 'dev' into likeable 
Conflicts:
	db/schema.rb
 2015-02-10 22:57:28 +11:00
Yoong Kang Lim 36a94156c1 Merge branch 'dev' into likeable 
Conflicts:
	db/schema.rb
 2015-02-10 22:54:45 +11:00
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
Yoong Kang Lim 33a66dce1f Starting stages of a like feature for posts. 2015-02-05 00:54:31 +11: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