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 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 43440657b6 Merge pull request #2281 from Growstuff/dev 
Production Release
 2019-11-19 17:04:33 +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
Brenda Wallace c6fffebb28 Update specs for new index layout with api docs 2019-11-18 10:50:13 +13:00
Brenda Wallace 8fb4725f46 Merge remote-tracking branch 'upstream/dev' into api-docs 
Conflicts:
	app/resources/api/v1/planting_resource.rb
 2019-11-18 10:26:05 +13:00
Brenda Wallace 0823e971ed Tidy up indexes and add links to data/api 2019-11-18 10:23:07 +13:00
Brenda Wallace 4f8830676e Swagger docs 2019-11-18 10:15:06 +13:00
Brenda Wallace 818a980f6d Move jsonapi resources files 2019-11-18 10:11:53 +13:00
dependabot-preview[bot] 0e8a085cce Bump scout_apm from 2.6.3 to 2.6.4 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.3 to 2.6.4.
- [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.3...v2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-17 07:45:34 +00:00
Brenda Wallace e096d2be93 Merge pull request #2276 from Growstuff/dev 
production release
 2019-11-17 17:11:43 +13:00
Brenda Wallace 0bc128b01d Merge pull request #2275 from Br3nda/fix-map-markers 
Add marker for leaflet maps, and use asset pipeline to serve file
 2019-11-17 14:00:09 +13:00
Brenda Wallace 140f625c48 Add new planting api attributes to test 2019-11-16 22:40:06 +13:00
Brenda Wallace 7ea14bccfe Fix alt on img tag 2019-11-16 22:32:45 +13:00
Brenda Wallace 8d87f3c982 Remove console debug statement 2019-11-16 20:38:43 +13:00
Brenda Wallace 4c82adc612 Added new api items to controller spec 2019-11-16 20:38:15 +13:00
Brenda Wallace 24f970f4f4 Added alt tag 2019-11-16 13:21:42 +13:00
Brenda Wallace c87ae7be29 add photo to the map, if we have one 2019-11-16 13:20:38 +13:00
Brenda Wallace 1697f3e758 Update model spec for location 2019-11-16 13:07:38 +13:00
Brenda Wallace df5b0499e4 Update spec for api resource 2019-11-16 13:05:40 +13:00
Brenda Wallace 535ddcdcff Added plantings to places map 2019-11-16 12:16:18 +13:00
Brenda Wallace a437338961 Fix markers on crops#show map 2019-11-16 11:35:45 +13:00
Brenda Wallace 66fae333a9 Rename crops js file so it gets included correctly 
this crops.js.erb file was being ignored because a crops.coffee exists
 2019-11-16 11:21:40 +13:00
Brenda Wallace 2b7c21bf2e Fix marker on member map too 2019-11-16 11:16:53 +13:00