mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-27 19:23:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,510 Commits 54 Branches 76 Tags
44a66ba3f20bb55684033dc7edf9c35333c19ebf
Commit Graph

8510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
44a66ba3f2 Bump scout_apm from 2.6.6 to 2.6.7 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.6 to 2.6.7.
- [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.6...v2.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-19 10:50:47 +13:00
dependabot-preview[bot]
a07235bea0 Bump cancancan from 3.0.2 to 3.1.0 
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases)
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/CanCanCommunity/cancancan/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-17 07:16:39 +13:00
dependabot-preview[bot]
82146ea835 Bump rspec-rails from 3.9.0 to 3.9.1 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [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.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-12 00:07:19 +13:00
dependabot-preview[bot]
2990c31245 Merge pull request #2467 from Growstuff/dependabot/bundler/bootstrap_form-4.4.0 2020-03-10 09:58:27 +00:00
dependabot-preview[bot]
f81538b873 Bump bootstrap_form from 4.3.0 to 4.4.0 
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.3.0 to 4.4.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.3.0...v4.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-10 09:37:35 +00:00
dependabot-preview[bot]
cbe75903fe Bump i18n-tasks from 0.9.30 to 0.9.31 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-10 22:35:30 +13:00
dependabot-preview[bot]
6a1a2d3094 Bump oj from 3.10.2 to 3.10.5 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.2 to 3.10.5.
- [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.10.2...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-08 10:52:12 +13:00
dependabot-preview[bot]
d8aa9a8839 Merge pull request #2464 from Growstuff/dependabot/bundler/hashie-4.1.0 2020-03-06 08:13:29 +00:00
dependabot-preview[bot]
6cef7ef167 Bump hashie from 3.6.0 to 4.1.0 
Bumps [hashie](https://github.com/hashie/hashie) from 3.6.0 to 4.1.0.
- [Release notes](https://github.com/hashie/hashie/releases)
- [Changelog](https://github.com/hashie/hashie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hashie/hashie/compare/v3.6.0...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-06 07:50:23 +00:00
Brenda Wallace
e6d26d5d21 Merge pull request #2466 from Growstuff/dependabot/bundler/leaflet-rails-1.6.0 
Bump leaflet-rails from 1.5.1 to 1.6.0
 2020-03-06 20:48:28 +13:00
dependabot-preview[bot]
4fd0924194 Bump leaflet-rails from 1.5.1 to 1.6.0 
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases)
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 08:04:45 +00:00
Brenda Wallace
6e9babd1ca Merge pull request #2463 from Growstuff/awesomecode-lint-ruby-rspec-hookargument-43686 
Auto corrected by following Lint Ruby RSpec/HookArgument
 2020-03-04 14:58:45 +13:00
Awesome Code
132a961008 Auto corrected by following Lint Ruby RSpec/HookArgument 2020-03-04 00:37:36 +00:00
dependabot-preview[bot]
9dc7c289bd Merge pull request #2455 from Growstuff/dependabot/bundler/haml_lint-0.35.0 2020-03-04 00:34:17 +00:00
dependabot-preview[bot]
0bc84f885c Bump haml_lint from 0.34.2 to 0.35.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.34.2 to 0.35.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.34.2...v0.35.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-03 23:18:27 +00:00
Brenda Wallace
85a645822a disable percy 2020-03-04 11:35:15 +13:00
Brenda Wallace
917ec11b80 Merge pull request #2461 from Growstuff/awesomecode-lint-ruby-rspec-describedclass-43668 
Auto corrected by following Lint Ruby RSpec/DescribedClass
 2020-03-04 11:33:47 +13:00
Brenda Wallace
d4fb4e79a1 Merge pull request #2454 from Growstuff/dependabot/bundler/rubocop-0.80.1 
Bump rubocop from 0.80.0 to 0.80.1
 2020-03-04 11:33:14 +13:00
Awesome Code
4cbe6ca244 Auto corrected by following Lint Ruby RSpec/DescribedClass 2020-03-03 22:33:13 +00:00
Brenda Wallace
c4732fbda4 bump codeclimate to 0.80 2020-03-04 11:32:48 +13:00
dependabot-preview[bot]
244b62f0d8 Bump rubocop from 0.80.0 to 0.80.1 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.0 to 0.80.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.80.0...v0.80.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-03 22:31:56 +00:00
Brenda Wallace
a6bb63d1b3 Merge pull request #2458 from Growstuff/dependabot/bundler/omniauth-1.9.1 
[Security] Bump omniauth from 1.9.0 to 1.9.1
 2020-03-04 11:30:01 +13:00
dependabot-preview[bot]
4fd73589be [Security] Bump omniauth from 1.9.0 to 1.9.1 
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-03 07:58:20 +00:00
Brenda Wallace
a1f130fb54 Merge pull request #2451 from Growstuff/dependabot/bundler/puma-4.3.3 
[Security] Bump puma from 4.3.2 to 4.3.3
 2020-03-03 15:24:17 +13:00
Brenda Wallace
88ae62fef4 Merge pull request #2453 from Br3nda/fix/member-link 
BUGFIX: member slug needed on photos, to make link
 2020-03-03 15:23:42 +13:00
Brenda Wallace
55147391f3 Merge pull request #2457 from Br3nda/fix/image-in-email 
Fix/image in email
 2020-03-03 15:23:23 +13:00
Brenda Wallace
89400e7677 Send reminder on mondays 2020-03-03 11:37:30 +13:00
Brenda Wallace
b61f6dd54d Added link to profile page 2020-03-03 11:35:08 +13:00
Brenda Wallace
e8e5c936d5 Remove broken image from planting reminder 2020-03-03 11:33:59 +13:00
Brenda Wallace
0ae2aeb4a7 Apply suggestions from code review 
Use delegated attributes
 2020-03-02 15:51:29 +13:00
Brenda Wallace
9fa3f36436 BUGFUX: member slug needed on photos, to make link 2020-03-02 15:01:34 +13:00
Brenda Wallace
35f8289b06 Turn off caching on modal form 2020-03-02 12:53:29 +13:00
dependabot-preview[bot]
bc8447f3a4 [Security] Bump puma from 4.3.2 to 4.3.3 
Bumps [puma](https://github.com/puma/puma) from 4.3.2 to 4.3.3. **This update includes a security fix.**
- [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.3.2...v4.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-01 23:30:49 +00:00
Brenda Wallace
a864a018d5 Fix icon images 2020-03-02 12:27:57 +13:00
Brenda Wallace
9594c2a63f Always show photos on harvests 2020-03-02 12:22:48 +13:00
Brenda Wallace
bb7a9b17c6 Merge remote-tracking branch 'upstream/dev' 2020-03-02 12:22:15 +13:00
Brenda Wallace
3c14496936 BUGFIX - caching on harvest form 2020-03-02 12:22:00 +13:00
Brenda Wallace
f4a39b1fd4 Merge pull request #2450 from Growstuff/dev 
Production release
 2020-03-02 12:16:03 +13:00
Brenda Wallace
7a48b099aa Merge pull request #2449 from Growstuff/imgbot 
[ImgBot] Optimize images
 2020-03-02 11:52:12 +13:00
ImgBotApp
d33db24f3c [ImgBot] Optimize images 
*Total -- 7.73kb -> 7.71kb (0.24%)

/app/assets/images/icons/plant_parts/other.svg -- 0.96kb -> 0.96kb (0.41%)
/app/assets/images/icons/plant_parts/seed.svg -- 1.86kb -> 1.86kb (0.26%)
/app/assets/images/icons/plant_parts/stem.svg -- 2.29kb -> 2.28kb (0.21%)
/app/assets/images/icons/plant_parts/root.svg -- 2.62kb -> 2.62kb (0.19%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2020-03-01 22:50:49 +00:00
Brenda Wallace
8e7ae445d7 Merge pull request #2442 from Growstuff/dependabot/bundler/active_utils-3.3.17 
Bump active_utils from 3.3.16 to 3.3.17
 2020-03-02 11:50:30 +13:00
Brenda Wallace
bf4d1afe99 Merge pull request #2443 from Br3nda/feature/crop-action-modals 
Harvesting, planting and seed saving modal forms
 2020-03-02 11:50:11 +13:00
Brenda Wallace
85d473d65c Adding descriptions 2020-03-02 11:49:50 +13:00
Brenda Wallace
4a23bcefd1 Tests tradeable and not tradeable seed saving 2020-03-02 10:21:54 +13:00
Brenda Wallace
9955d26c1b Added options from seed saving form to spec 2020-03-01 08:48:21 +13:00
Brenda
f13bc44e7e update link labels in spec 2020-03-01 08:33:04 +13:00
Brenda
5c7b8254b0 plant_part is on harvest not planting 2020-03-01 08:32:53 +13:00
Brenda
7039240bdc always show photos section on harvests 2020-03-01 07:57:19 +13:00
Brenda
cc83cb23bc fix plant part selection bug on editing harvests 2020-03-01 07:57:04 +13:00
Brenda
88ac147dda Restore old labels on buttons 2020-03-01 07:56:34 +13:00