Daniel O'Connor
c43ec3d256
Merge branch 'dev' into bw/useless-assignments
2016-12-04 10:30:41 +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
1388aa3b06
Merge branch 'dev' into bw/useless-assignments
2016-12-03 08:23:19 +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
637b46ef10
add photos to seeds
...
Fixes #495
2016-12-01 12:54:55 -05:00
Brenda Wallace
178c181cf5
Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments
...
Conflicts:
app/controllers/crops_controller.rb
app/models/crop.rb
spec/models/scientific_name_spec.rb
2016-11-30 10:32:02 +13: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
8c7fcd9d49
Fixed all useless assignments
2016-11-26 19:36:59 +13:00
Brenda Wallace
bcdd2a9167
Changed called to rails dynamic find_by
2016-11-26 15:55:38 +13: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
4cf0f85ee8
Indent the first parameter one step more than the start of the previous line.
2016-11-26 11:46:31 +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
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
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
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
