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

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
01d974f9ee Merge pull request #2259 from Br3nda/parent-seed 
Specs for linking plantings to seeds
 2019-11-01 22:13:20 +13:00
Brenda Wallace
d0bee45c0c show all varieties (including grandchildren) 2019-11-01 21:33:43 +13:00
Brenda Wallace
c27622803d Specs for linking plantings to seeds 2019-11-01 17:18:51 +13:00
Brenda Wallace
b214f7ad8d linking existing plantings to their parent seeds 2019-11-01 02:23:14 +00:00
dependabot-preview[bot]
2cb438f15d Bump rubocop from 0.75.1 to 0.76.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.75.1 to 0.76.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.75.1...v0.76.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-01 00:25:00 +00:00
Brenda Wallace
6b023de063 Merge pull request #2255 from Growstuff/dev 
Production release
 2019-10-29 13:26:43 +13:00
Brenda Wallace
91fa8e6a62 Merge pull request #2254 from Br3nda/seeds 
tidy up display of seeds
 2019-10-29 11:25:57 +13:00
Brenda Wallace
585406ad11 Merge branch 'dev' into seeds 2019-10-28 22:19:50 +13:00
Brenda Wallace
2f2169f89a tidy up display of seeds 2019-10-28 22:12:08 +13:00
dependabot-preview[bot]
b24beae9af Bump chartkick from 3.2.1 to 3.2.2 
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 08:53:06 +00:00
dependabot-preview[bot]
42e4d24004 Bump sidekiq from 6.0.2 to 6.0.3 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 08:33:50 +00:00
Brenda Wallace
e472e1cd14 Merge pull request #2248 from Growstuff/dev 
Production release
 2019-10-27 14:09:44 +13:00
Brenda Wallace
a9f3125191 Merge pull request #2249 from Br3nda/weeks 
planting time line week by week
 2019-10-27 13:22:48 +13:00
Brenda Wallace
b2e90cddc6 Merge branch 'dev' into weeks 2019-10-25 13:41:30 +13:00
André Aubin
279d85456b Switching gravatar urls to secure subdomain 2019-10-24 23:51:52 +00:00
André Aubin
a3fa774d84 Force ssl on gravatar-ultimate gem 2019-10-24 23:51:52 +00:00
André Aubin
15608fc86a Update Contributors.md 2019-10-24 23:51:52 +00:00
André Aubin
66045866b3 Switch to HTTPS for Gravatar urls 2019-10-24 23:51:52 +00:00
Brenda Wallace
8cf5acc30a Update spec to expect weeks to be rounded 2019-10-25 07:42:13 +13:00
Brenda Wallace
9d232e26cb Update app/views/crops/_predictions.html.haml 2019-10-25 06:42:00 +13:00
Brenda Wallace
d96b30fff8 spec for in_weeks method 2019-10-24 21:06:28 +13:00
Brenda Wallace
2d6d02d0b3 added in_weeks helper 2019-10-24 21:03:30 +13:00
Brenda Wallace
358631d0f9 update spec to look for weeks 2019-10-24 20:58:27 +13:00
Brenda Wallace
95ae4d41ba rounding on weeks 2019-10-24 20:58:13 +13:00
Brenda Wallace
627d97155f Tidy up 2019-10-24 19:59:18 +13:00
Brenda Wallace
329262e2f5 show "finished" when planting is finished 2019-10-24 19:45:08 +13:00
Brenda Wallace
5d4f1abacd show unknown date when unknown finish date 2019-10-24 19:44:58 +13:00
Brenda Wallace
f7f3ac695f better name for css class progress-fade 2019-10-24 19:16:41 +13:00
Brenda Wallace
a1479c9126 fixed call to missing method 2019-10-24 19:13:41 +13:00
Brenda Wallace
dfe533dda1 DRY and tidy 2019-10-24 19:13:20 +13:00
Brenda Wallace
f4c4e1c93f Collapse crop card content 2019-10-24 19:10:44 +13:00
Brenda Wallace
1a0e30491f Removed unused methods 2019-10-24 19:04:37 +13:00
Brenda Wallace
053a33cd72 Removed commented out code 2019-10-24 18:58:50 +13:00
Brenda Wallace
0cc62c2b98 show planted_at, even when we can't predict finish 2019-10-24 18:57:16 +13:00
Brenda Wallace
c094b5daf9 Update spec, to look for new emojii timeline 2019-10-24 18:55:47 +13:00
Brenda Wallace
38713af603 plantings timeline with icons 2019-10-24 16:36:16 +13:00
Brenda Wallace
dc3a730064 update spec to use expect syntax 2019-10-24 16:15:06 +13:00
dependabot-preview[bot]
85634fc43b Bump factory_bot_rails from 5.1.0 to 5.1.1 
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.1.0...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 08:58:12 +00:00
dependabot-preview[bot]
9de1d02cb1 Bump loofah from 2.3.0 to 2.3.1 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-23 08:27:33 +00:00
Brenda Wallace
d5d0c9e132 Merge pull request #2224 from Br3nda/search 
Show more results in search
 2019-10-23 21:06:10 +13:00
Brenda Wallace
ae48844d87 Merge branch 'dev' into search 2019-10-23 15:55:27 +13:00
Brenda Wallace
3ef85ac2f6 Merge pull request #2221 from Br3nda/planting-reminders 
📧 Polish planting reminders stylings and data
 2019-10-23 15:55:10 +13:00
Brenda Wallace
19cb89be1e Merge branch 'dev' into planting-reminders 2019-10-23 09:24:56 +13:00
dependabot-preview[bot]
603251de75 Bump selenium-webdriver from 3.142.4 to 3.142.6 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.4 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 19:07:56 +00:00
Brenda Wallace
f4f9f8626c Merge branch 'dev' into search 2019-10-23 07:46:05 +13:00
Brenda Wallace
8b7697c6d6 Merge branch 'dev' into planting-reminders 2019-10-23 07:45:24 +13:00
dependabot-preview[bot]
b69baa8b22 Bump rspec-rails from 3.8.2 to 3.9.0 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 18:43:28 +00:00
dependabot-preview[bot]
9b4ead388b Bump rake from 12.3.3 to 13.0.0 
Bumps [rake](https://github.com/ruby/rake) from 12.3.3 to 13.0.0.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v12.3.3...v13.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 14:56:52 +00:00
dependabot-preview[bot]
4fa803a40d Bump listen from 3.1.5 to 3.2.0 
Bumps [listen](https://github.com/guard/listen) from 3.1.5 to 3.2.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.1.5...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 14:14:57 +00:00
dependabot-preview[bot]
ebe3c9c0e6 Bump faker from 2.4.0 to 2.6.0 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.4.0 to 2.6.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.4.0...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 13:04:42 +00:00