mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 15:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,807 Commits 65 Branches 76 Tags
cf0485c4480ef6091b285ea36c1936bb783fbbca
Commit Graph

7807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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