mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brenda ef2820eb8c fix deprecation warning from faker 2020-03-01 07:56:02 +13:00
Brenda 7e42d84a21 group crop actions in to button bar 2020-03-01 07:55:47 +13:00
Brenda Wallace 0fdbac5bc3 Update plant_parts.rb 2020-02-29 23:01:00 +13:00
Brenda Wallace 46220b8275 Update plant_parts.rb 2020-02-29 22:01:02 +13:00
Brenda Wallace 4e093716f2 Add number on the end 2020-02-29 21:30:08 +13:00
Brenda Wallace 52e28f4ae2 Link new harvest to planting 2020-02-29 20:07:30 +13:00
Brenda Wallace f4acbaa89a Use pokemon for plant parts 2020-02-29 19:53:39 +13:00
Brenda c099580b70 Update link in spec 2020-02-29 19:49:57 +13:00
Brenda 3c392d43ee Crop#show with seeds modal 2020-02-29 19:49:49 +13:00
Brenda bb400dabda Add new garden button on modal planting form 2020-02-29 13:37:27 +13:00
Brenda 43180bd6cb unique plantpart names in factory bot 2020-02-29 13:26:51 +13:00
Brenda f3cd341659 add an id to the harvest modal so the test can find it 2020-02-29 13:26:36 +13:00
Brenda fd80fc98f1 use a default icon if no plant_part icon 2020-02-29 13:26:20 +13:00
Brenda Wallace d0154a8b60 Fall back on planting icon when plant part icon does not exist 2020-02-29 12:34:28 +13:00
Brenda cbec6b2743 Remove harvest button from crop info card until we can distinguish between it and the planting crop button 2020-02-29 12:20:53 +13:00
Brenda Wallace b5f7156677 Makes sure factorybot plant names point to images that exist 2020-02-29 12:09:26 +13:00
Brenda 1503b39ad3 Seed saving modal 2020-02-29 11:19:19 +13:00
Brenda Wallace 97208b99c5 Plantings modal form on crops#show 2020-02-29 10:28:32 +13:00
Brenda Wallace 777877ab06 Added plantings modal button to crop info card 2020-02-29 10:25:45 +13:00
Brenda Wallace 6c94337047 Added Plantings modal form 2020-02-29 10:23:00 +13:00
Brenda Wallace 68d157b048 Removed extra harvest button on plantings#show 2020-02-29 10:22:46 +13:00
Brenda Wallace 8dd47e0639 Added harvest button to crop info card 2020-02-29 10:09:06 +13:00
dependabot-preview[bot] 952a97f5a5 Bump puma from 4.3.1 to 4.3.2 
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2.
- [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.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot] f58732bcab Bump will_paginate from 3.2.1 to 3.3.0 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot] 720a0fa645 Bump better_errors from 2.5.1 to 2.6.0 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00
dependabot-preview[bot] af1948f95c [Security] Bump nokogiri from 1.10.7 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 10:05:56 +13:00