Skip to content

Commit

Permalink
Merge pull request #162 from sharetribe/update-v9.0.2-from-upstream
Browse files Browse the repository at this point in the history
Update v9.0.2 from upstream
  • Loading branch information
Gnito authored Oct 17, 2022
2 parents 034fde0 + 2cd1510 commit 0572f27
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 14 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ way to update this template, but currently, we follow a pattern:

## Upcoming version 2022-XX-XX

## [v10.0.3] 2022-10-17

### Updates from upstream (FTW-daily v9.0.2)

- [change] Add links to free Privacy Policy and Terms of Service templates
[#1553](https://github.com/sharetribe/ftw-daily/pull/1553)

[v10.0.3]: https://github.com/sharetribe/ftw-product/compare/v10.0.2...v10.0.3

## [v10.0.2] 2022-08-30

### Updates from upstream (FTW-daily v9.0.1)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "app",
"version": "10.0.2",
"version": "10.0.3",
"private": true,
"license": "Apache-2.0",
"dependencies": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"final-form-arrays": "^3.0.2",
"full-icu": "^1.4.0",
"helmet": "^4.6.0",
"jose": "4.8.1",
"jose": "4.9.2",
"lodash": "^4.17.21",
"mapbox-gl-multitouch": "^1.0.3",
"moment": "^2.29.4",
Expand Down
9 changes: 5 additions & 4 deletions src/components/PrivacyPolicy/PrivacyPolicy.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ const PrivacyPolicy = props => {
<p className={css.lastUpdated}>Last updated: July 1st, 2021</p>

<p>
Thank you for using Sneakertime! Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Thank you for using Sneakertime! Every marketplace business needs Terms of Service and
Privacy Policy agreements. To help you launch your marketplace faster, we've compiled
two templates you can use as a baseline for the agreements between your online marketplace
business and its users. You can access these templates at
https://www.sharetribe.com/docs/operator-guides/free-templates/
</p>

<h2>1 Lorem ipsum dolor sit amet</h2>
Expand Down
9 changes: 5 additions & 4 deletions src/components/TermsOfService/TermsOfService.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ const TermsOfService = props => {
<p className={css.lastUpdated}>Last updated: July, 1st 2021</p>

<p>
Thank you for using Sneakertime! Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Thank you for using Sneakertime! Every marketplace business needs Terms of Service and
Privacy Policy agreements. To help you launch your marketplace faster, we've compiled
two templates you can use as a baseline for the agreements between your online marketplace
business and its users. You can access these templates at
https://www.sharetribe.com/docs/operator-guides/free-templates/
</p>

<h2>1 Lorem ipsum dolor sit amet</h2>
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8082,10 +8082,10 @@ jest@^27.4.3:
import-local "^3.0.2"
jest-cli "^27.5.1"

jose@4.8.1:
version "4.8.1"
resolved "https://registry.yarnpkg.com/jose/-/jose-4.8.1.tgz#dc7c2660b115ba29b44880e588c5ac313c158247"
integrity sha512-+/hpTbRcCw9YC0TOfN1W47pej4a9lRmltdOVdRLz5FP5UvUq3CenhXjQK7u/8NdMIIShMXYAh9VLPhc7TjhvFw==
jose@4.9.2:
version "4.9.2"
resolved "https://registry.yarnpkg.com/jose/-/jose-4.9.2.tgz#268994df4443b9c191de0b001c2e3796ac6cf368"
integrity sha512-EqKvu2PqJCD3Jrg3PvcYZVS7D21qMVLSYMDAFcOdGUEOpJSLNtJO7NjLANvu3SYHVl6pdP2ff7ve6EZW2nX7Nw==

js-cookie@^2.1.3:
version "2.2.1"
Expand Down

0 comments on commit 0572f27

Please sign in to comment.