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 f27cf0caf6 Added link to icon documentation 2019-11-16 11:11:41 +13:00
Brenda Wallace df55a5b0a8 Add marker for leaflet maps, and use asset pipeline to serve file 2019-11-16 10:42:22 +13:00
Brenda Wallace 1dec690951 Merge pull request #2273 from Growstuff/dev 
production release
 2019-11-15 12:55:19 +13:00
Brenda Wallace 69d9e1e76e Merge pull request #2271 from Br3nda/jump-to-garden 
Link to jump to garden
 2019-11-15 12:16:39 +13:00
Brenda Wallace e127832d37 Merge pull request #2272 from Br3nda/ordering 
Order the garden names
 2019-11-15 12:16:23 +13:00
Brenda Wallace cfef6f5eb2 Link to jump to garden 2019-11-15 11:47:32 +13:00
Brenda Wallace 75037c7e21 Order the garden names 2019-11-15 11:32:13 +13:00
Brenda Wallace 856d975551 Merge pull request #2269 from Growstuff/dev 
Production release
 2019-11-13 11:44:01 +13:00
dependabot-preview[bot] a4659f141a Bump rake from 13.0.0 to 13.0.1 
Bumps [rake](https://github.com/ruby/rake) from 13.0.0 to 13.0.1.
- [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/v13.0.0...v13.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 08:13:20 +00:00
dependabot-preview[bot] 476f068807 Bump omniauth-flickr from 0.0.19 to 0.0.20 
Bumps [omniauth-flickr](https://github.com/timbreitkreutz/omniauth-flickr) from 0.0.19 to 0.0.20.
- [Release notes](https://github.com/timbreitkreutz/omniauth-flickr/releases)
- [Commits](https://github.com/timbreitkreutz/omniauth-flickr/compare/v0.0.19...v0.0.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 01:10:16 +00:00
Brenda Wallace 6bd53094ba Merge pull request #2267 from Growstuff/imgbot 
[ImgBot] Optimize images
 2019-11-11 19:00:15 +13:00
ImgBotApp be884ad1fb [ImgBot] Optimize images 
*Total -- 24.17kb -> 22.54kb (6.78%)

/app/assets/images/icons/timeline.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/finished.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/planting-add.svg -- 2.81kb -> 2.52kb (10.45%)
/app/assets/images/icons/seed-add.svg -- 4.21kb -> 3.91kb (7.07%)
/app/assets/images/icons/sprout-add.svg -- 3.81kb -> 3.58kb (6%)
/app/assets/images/icons/seeds.svg -- 3.45kb -> 3.29kb (4.69%)
/app/assets/images/icons/harvest-add.svg -- 4.98kb -> 4.78kb (3.9%)
/app/assets/images/icons/trade.svg -- 0.91kb -> 0.89kb (2.14%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-11-11 05:00:09 +00:00
Brenda Wallace 130febb735 Change regex not letting utf-8 garden names save (#1641) 
* Remove regex not letting utf-8 garden names save
closes #1634
 2019-11-11 17:59:41 +13:00
Brenda Wallace b8b579a5ba rubycop fix up 2019-11-11 17:45:37 +13:00
codefactor-io e0ea039347 [CodeFactor] Apply fixes to commit a651f07 2019-11-11 04:42:30 +00:00
Brenda Wallace a651f079d8 Simplify garden.name validation regexp 2019-11-11 17:41:46 +13:00
Brenda Wallace cfaa18daaf Merge remote-tracking branch 'upstream/dev' into UTFGardenNames 2019-11-11 14:14:34 +13:00
dependabot-preview[bot] 9b15b42cbd [Security] Bump chartkick from 3.2.2 to 3.3.0 
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.2.2 to 3.3.0. **This update includes a security fix.**
- [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.2...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-10 09:44:33 +00:00
dependabot-preview[bot] 5cb00f4423 Bump puma from 4.2.1 to 4.3.0 
Bumps [puma](https://github.com/puma/puma) from 4.2.1 to 4.3.0.
- [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.1...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 23:32:20 +00:00
dependabot-preview[bot] e617d2aac9 Bump faker from 2.6.0 to 2.7.0 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.6.0 to 2.7.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.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 09:18:10 +00:00
dependabot-preview[bot] bdfce436b4 Bump scout_apm from 2.6.2 to 2.6.3 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.2 to 2.6.3.
- [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.2...v2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 08:48:02 +00:00
Brenda Wallace 74d4f19203 Merge pull request #2261 from Growstuff/dev 
Production Release
 2019-11-05 13:16:29 +13:00
Brenda Wallace a4b7ded8a3 Merge pull request #2260 from Br3nda/all-varieties 
show all varieties (including grandchildren)
 2019-11-05 11:12:42 +13:00
Brenda Wallace 405de0fb18 Merge branch 'dev' into all-varieties 2019-11-02 13:21:30 +13:00
Brenda Wallace 1f8ef86053 Merge pull request #2258 from Growstuff/dev 
Production release
 2019-11-01 22:13:39 +13:00
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