mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-06 07:31:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,845 Commits 65 Branches 76 Tags
6325df25b87e00a5d2ebdab8dde94f10d17cc975
Commit Graph

7845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
6325df25b8 Make the month an int 2019-11-24 11:36:55 +13:00
Brenda Wallace
b8c1f10907 Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest 2019-11-24 10:46:07 +13:00
Brenda Wallace
83f0182551 rubocop lint 2019-11-24 10:41:20 +13:00
Brenda Wallace
0f73c13622 Merge branch 'dev' into predict-perenial-harvest 2019-11-24 10:40:22 +13:00
Brenda Wallace
5b7de1ae7a Added location 2019-11-24 10:39:06 +13:00
Brenda Wallace
554adf234e Allow chaining on Harvest predictions method returns 2019-11-24 10:30:56 +13:00
Brenda Wallace
e3b01cdca0 Merge pull request #2287 from Br3nda/homepage-caching 
Added lots of caching
 2019-11-24 10:19:17 +13:00
Brenda Wallace
a8a522d09e rubocop style fix 2019-11-24 10:17:55 +13:00
Brenda Wallace
bd2b5c6448 Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest 2019-11-24 10:15:53 +13:00
Brenda Wallace
0bb4dbec10 Display of planting neighbours 2019-11-24 10:15:11 +13:00
Brenda Wallace
e40cca806c World neighbours 2019-11-24 09:44:35 +13:00
codefactor-io
fd744cf67a [CodeFactor] Apply fixes 2019-11-23 20:44:19 +00:00
Brenda Wallace
70565c7202 show neighbouring plantings same crop 
also helps see where the prediction came from
 2019-11-24 09:43:25 +13:00
codefactor-io
a23963ba96 [CodeFactor] Apply fixes 2019-11-23 19:58:22 +00:00
Brenda Wallace
c0fabc7002 Reducing unnecesary and extra queries 2019-11-24 08:57:34 +13:00
Brenda Wallace
c3d626636b Added icons so sections line up 2019-11-24 08:49:00 +13:00
Brenda Wallace
1c2a88da55 Added lots of caching 2019-11-24 08:45:23 +13:00
Brenda Wallace
5793f26b6f stub tests 2019-11-24 08:41:12 +13:00
Brenda Wallace
09a70c4742 Predict month of harvest on perennials 2019-11-23 22:21:36 +13:00
Brenda Wallace
ab1b77ede8 Updated gemlock for ruby version 2019-11-23 08:19:21 +13:00
Brenda Wallace
a645c696f3 Bump ruby version to 2.6.5 2019-11-23 07:59:59 +13:00
Brenda Wallace
9246176ecf Merge remote-tracking branch 'upstream/dev' into dev 2019-11-23 07:56:17 +13:00
Brenda Wallace
712184fb6e Bump ruby version to 2.6.5 2019-11-23 07:54:22 +13:00
Brenda Wallace
ab9cf4f3fa Fix gemfile, so rspec isn't expected in production 2019-11-23 07:52:22 +13:00
Brenda Wallace
7130679744 Added node buildback to heroku config 2019-11-23 07:46:34 +13:00
Brenda Wallace
8449308f41 Set node and yarn versions, so heroku picks good ones 2019-11-23 07:44:06 +13:00
dependabot-preview[bot]
95e2ca9ce0 Bump searchkick from 4.1.0 to 4.1.1 
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/ankane/searchkick/releases)
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/searchkick/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 05:35:16 +00:00
Brenda Wallace
a92710eab7 Update schema 2019-11-19 21:08:47 +13:00
Brenda Wallace
93be74af08 Merge pull request #2278 from Br3nda/api-docs 
Api docs using swagger
 2019-11-19 17:42:45 +13:00
Brenda Wallace
e986b1c60c Merge branch 'dev' into api-docs 2019-11-19 16:18:24 +13:00
Brenda Wallace
6c35c44786 Merge remote-tracking branch 'upstream/dev' into dev 2019-11-19 16:09:51 +13:00
Brenda Wallace
363d39705a migration goes up only 2019-11-19 16:09:01 +13:00
Brenda Wallace
5b6bd4e198 Merge pull request #2282 from Br3nda/cms-upgrade 
Migrate CMS tags
 2019-11-19 16:08:37 +13:00
Brenda Wallace
327014ba73 Migrate CMS tags 
copied from https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Upgrade-CMS-From-1.12-to-2.0
 2019-11-19 16:05:13 +13:00
Brenda Wallace
1eca0de6d9 Merge branch 'dev' into api-docs 2019-11-19 15:36:39 +13:00
Brenda Wallace
1023409f5e Merge pull request #2280 from Br3nda/cms-upgrade 
Finish the CMS upgrade and fix #2098
 2019-11-19 15:34:55 +13:00
codefactor-io
0ece05ca6b [CodeFactor] Apply fixes to commit 0958a13 2019-11-19 02:15:15 +00:00
Brenda Wallace
0958a134ed Finish the CMS upgrade and fix #2098 2019-11-19 15:14:08 +13:00
Brenda Wallace
cf0485c448 fix mobile display 2019-11-19 14:25:14 +13:00
Brenda Wallace
72e348cdf6 Fix up specs 2019-11-19 14:16:50 +13:00
Brenda Wallace
b1bb1a4b95 Corrected path in swagger config 2019-11-19 14:02:03 +13:00
Brenda Wallace
76ee0c1cd8 rubocop lint 2019-11-19 13:58:16 +13:00
Brenda Wallace
6bb7cec35b Merge remote-tracking branch 'upstream/dev' into api-docs 2019-11-19 13:53:38 +13:00
Brenda Wallace
5db98b5d5b Merge remote-tracking branch 'origin/api-docs' into api-docs 2019-11-19 13:53:25 +13:00
Brenda Wallace
0c3149205b Put resources back into namespaces 2019-11-19 13:53:12 +13:00
dependabot-preview[bot]
35c2073bd8 [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4 
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.**
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 21:26:04 +00:00
Brenda Wallace
bcc4b51713 Merge branch 'dev' into api-docs 2019-11-18 19:09:22 +13:00
Brenda Wallace
fa1e70036a Fix name of spec 2019-11-18 16:06:57 +13:00
dependabot-preview[bot]
46f6cd4fd9 [Security] Bump nokogiri from 1.10.4 to 1.10.5 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.5. **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.4...v1.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-17 23:37:08 +00:00
Brenda Wallace
be4a250c63 renamed files to please rubocop 2019-11-18 11:08:23 +13:00