mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-01 05:01:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,713 Commits 62 Branches 76 Tags
627d97155f63ff59cd1833b6abb0bc24fe6479c4
Commit Graph

7713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot-preview[bot]
9eff481606 Bump rubocop-rspec from 1.35.0 to 1.36.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.35.0 to 1.36.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.35.0...v1.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 12:26:09 +00:00
dependabot-preview[bot]
9ae80fbf9d Bump oj from 3.9.1 to 3.9.2 
Bumps [oj](https://github.com/ohler55/oj) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.9.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 11:06:44 +00:00
dependabot-preview[bot]
f1cc01313f Bump puma from 4.2.0 to 4.2.1 
Bumps [puma](https://github.com/puma/puma) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 10:10:07 +00:00
dependabot-preview[bot]
09f0ec1dc0 Bump rubocop from 0.74.0 to 0.75.1 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.74.0 to 0.75.1.
- [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.74.0...v0.75.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 09:45:26 +00:00
dependabot-preview[bot]
d49a4c8db0 Bump scout_apm from 2.6.1 to 2.6.2 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.1...v2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 01:14:15 +00:00
dependabot-preview[bot]
6d4e68f58d Bump newrelic_rpm from 6.6.0.358 to 6.7.0.359 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.6.0.358 to 6.7.0.359.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/compare/6.6.0.358...6.7.0.359)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 00:53:44 +00:00
dependabot-preview[bot]
bb18d1dea3 Bump sidekiq from 6.0.0 to 6.0.2 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.0 to 6.0.2.
- [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.0...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-22 00:19:12 +00:00
dependabot-preview[bot]
00b8f72152 Bump faraday from 0.15.4 to 0.17.0 
Bumps [faraday](https://github.com/lostisland/faraday) from 0.15.4 to 0.17.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v0.15.4...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 22:06:47 +00:00
dependabot-preview[bot]
55547d2916 Bump webdrivers from 4.1.2 to 4.1.3 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.2...v4.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 21:41:22 +00:00
dependabot-preview[bot]
073cbeaab6 Bump loofah from 2.2.3 to 2.3.0 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.0.
- [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.2.3...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 21:12:06 +00:00
dependabot-preview[bot]
bdbe73ada2 Bump haml_lint from 0.33.0 to 0.34.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.33.0 to 0.34.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.33.0...v0.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 20:34:39 +00:00
dependabot-preview[bot]
b9738c8c0f Bump will_paginate from 3.1.8 to 3.2.1 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.8 to 3.2.1.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.8...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 19:50:51 +00:00
dependabot-preview[bot]
a4e8cc2234 Bump bootstrap_form from 4.2.0 to 4.3.0 
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases)
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 18:21:16 +00:00
dependabot-preview[bot]
f471913b74 [Security] Bump rubyzip from 1.2.3 to 1.3.0 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.3...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 17:58:12 +00:00
Brenda Wallace
c6f4eef291 Show more results in searches 2019-10-21 16:24:31 +13:00
Brenda Wallace
6d6d1930d1 Merge branch 'dev' into planting-reminders 2019-10-21 15:53:25 +13:00
Brenda Wallace
71e6ee98b9 Merge pull request #2202 from Br3nda/role-admin 
Administer member's roles
 2019-10-21 15:52:31 +13:00
Brenda Wallace
d90a58218a Remove roles#show 2019-10-21 15:38:46 +13:00
Brenda Wallace
13c024fac9 Fixed typo in spec 2019-10-21 15:13:47 +13:00
Brenda Wallace
798883be1c Typo/spelling fix 2019-10-21 14:45:21 +13:00
Brenda Wallace
abd91fa37b Use bang! to indicate method can explode 2019-10-21 14:43:46 +13:00
Brenda Wallace
498a754eea update specs for admin roles 2019-10-21 14:32:23 +13:00
Brenda Wallace
6280115055 Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin 2019-10-21 14:27:02 +13:00
Brenda Wallace
47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00