Brenda Wallace
ac165ce0cd
Adding counter caches
2017-04-14 11:32:31 +12:00
Brenda Wallace
e229438997
rubocop fox for numeric literals
2017-03-01 17:46:12 +13:00
Brenda Wallace
6017c4ba23
Marked our one ReversibleMigration as okay
2017-02-16 12:32:37 +13:00
Brenda Wallace
ff50ec65d0
Merge remote-tracking branch 'upstream/dev' into HEAD
2017-01-22 18:26:29 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Mackenzie Morgan
c2de65e515
Merge branch 'seed_photos' of gitmaco:maco/growstuff into seed_photos
2016-12-02 23:18:05 -05:00
Mackenzie Morgan
c201200e9b
correct schema and add index for photos_seeds
2016-12-02 23:17:01 -05:00
Shiny
7785a9d797
Merge branch 'dev' into seed_photos
2016-12-03 09:31:20 +13:00
Shiny
0c2a60ecc3
Reduce max AbcSize to 38 ( #1112 )
...
Reduce how complex methods are allowed to be, according to our code checker, so we're forced to write readable code
2016-12-02 08:06:53 -05:00
Mackenzie Morgan
a3c8bc0586
include the migration
2016-12-01 13:23:52 -05:00
Mackenzie Morgan
832719b01a
merge from upstream dev
2016-11-29 09:37:25 -05:00
Mackenzie Morgan
e1a2b168c9
rename scientific_names.scientific_name to scientific_names.name
...
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
Brenda Wallace
e62adc297a
Aligning end on branches
2016-11-26 11:55:54 +13:00
Brenda Wallace
ebacd83dde
Case statement indentation clean up
2016-11-26 11:42:34 +13:00
Brenda Wallace
c878baa886
Indented parameters cleanup
2016-11-26 11:41:07 +13:00
Brenda Wallace
bae25cfe8f
Fixed hash alignment in a funky big DDL
2016-11-26 11:16:55 +13:00
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
AELOGICA
372a7f080d
Added the days before maturity feature #678
2015-07-07 08:20:42 +08: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
Mackenzie Morgan
b66b8263c1
resolving schema merge
2015-02-09 00:06:18 -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
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
Miles Gould
c1870d46a2
Merge branch 'dev' into seed_properties
...
Conflicts:
db/schema.rb
2015-02-02 17:45:49 +00: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
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
Brenda Wallace