PR-merge master #1

shauvik · 2019-07-21T11:38:36Z

Updating master from Automattic.

Due to frequent confusion regarding how to remove the DMCA advisory message, we are removing that section.

Changes taking effect May 25, 2018.

Added more specific information to help clarify our practices, included information for Polldaddy and WooCommerce.com services, and added information to reflect the requirements of the EU’s General Data Protection Regulation. Changes take effect May 25, 2018.

Changes taking effect May 25, 2018. http://en.blog.wordpress.com/2018/05/13/new-privacy-features-and-updated-policies

…ns.md

Fixed formatting issues.

Added a link to a support doc.

Small typo you -> your

Included information for Simplenote, Simperium, Cloudup, and Lean Domain Search.

General reorganization and cleanup.

Accidentally changed "user agent" to "user" in last update. Reverting this change.

Polldaddy was rebranded as Crowdsignal. More details here: https://crowdsignal.com/support/crowdsignal-faq/

Polldaddy was rebranded as Crowdsignal.

Fixed formatting.

Added cookies set for visitors to sites with the Parse.ly plugin installed.

Fix missing "able" in "be able to"

Updated for WooPay

WooPay link updates

Updated date to match the user-facing TOS page

Miscellaneous updates and clarifications, including removal of section 16 (Arbitration Agreement) and updates to include certain European user rights.

Fixing a typo

Remove repeated paragraph in Wordpress TOS

Added wp.cloud to the list of our websites.

Updated the California rights section to apply to additional US states.

Miscellaneous updates, like adding USPS's Privacy Act Statement, incorporating our advertising policy, and making clear that Jetpack services are available through various plugins.

Added sections for AI features and Built By WordPress.com Express.

Miscellaneous updates and clarifications, including changing instances of “WooCommerce” to “Woo."

Changed instances of “WooCommerce” to “Woo.”

Miscellaneous updates, including clarifications to European users’ right to withdrawal as well as our relationship with third-party services sold via Woo.com and WordPress.com.

Miscellaneous updates and clarifications, including the addition of Studio and changing instands of "Woo.com" to "WooCommerce.com".

Removed the outdated list of specific US states covered by the US Privacy Laws section

Updated for Blaze Pro

Stephanie Elder and others added 30 commits April 16, 2018 09:40

Removed section regarding advisory message

a28aaee

Due to frequent confusion regarding how to remove the DMCA advisory message, we are removing that section.

Update language and added markdown

83884c1

Fixed link and added markdown

3c04fba

Create WooCommerce Use Terms

a8130e5

Create Polldaddy

51967f2

Delete Polldaddy

f2ecbc8

Create Polldaddy Terms and Conditions

4dabc64

Update Polldaddy Terms and Conditions

54d0c0b

Changes taking effect May 25, 2018.

Update Automattic Ads.md

ddd8fd7

Changes taking effect May 25, 2018.

Update WooCommerce Use Terms

0bda1cd

Changes taking effect May 25, 2018.

Update Privacy-Policy.md

e48de85

Added more specific information to help clarify our practices, included information for Polldaddy and WooCommerce.com services, and added information to reflect the requirements of the EU’s General Data Protection Regulation. Changes take effect May 25, 2018.

Update EN-Terms-of-Service.md

98cdfb8

Changes taking effect May 25, 2018. http://en.blog.wordpress.com/2018/05/13/new-privacy-features-and-updated-policies

Update Automattic Ads.md

86999f0

Rename Polldaddy Terms and Conditions to Polldaddy Terms and Conditio…

8b67dd6

…ns.md

Rename WooCommerce Use Terms to WooCommerce Use Terms.md

c980cfd

Create Privacy Notice for Visitors to Our Users’ Sites.md

e7ba046

Small typo you -> your

c4a161c

Update filename

8c7b9b4

Update file name

72a5e00

Create Cookie-Policy.md

70d4825

Update Privacy-Policy.md

ad08f62

Fixed formatting issues.

Update Privacy-Policy.md

01f4643

Added a link to a support doc.

Update EN-Terms-of-Service.md

42053c7

Merge pull request #30 from ivanpenchev/patch-1

82db5c4

Small typo you -> your

Update Privacy-Policy.md

8164566

Included information for Simplenote, Simperium, Cloudup, and Lean Domain Search.

Update Legal-Guidelines.md

4f66996

General reorganization and cleanup.

Update Legal-Guidelines.md

070771d

Accidentally changed "user agent" to "user" in last update. Reverting this change.

Update Privacy-Policy.md

d3f0041

Polldaddy was rebranded as Crowdsignal. More details here: https://crowdsignal.com/support/crowdsignal-faq/

Update Privacy-Notice-for-Visitors-to-Our-Users-Sites.md

7b9e223

Polldaddy was rebranded as Crowdsignal.

Update Polldaddy Terms and Conditions.md

9f73d2e

Fixed formatting.

jennyzhu and others added 30 commits February 14, 2022 15:53

Update Cookie-Policy.md

8ec8a54

Added cookies set for visitors to sites with the Parse.ly plugin installed.

Fix missing "able" in "be able to"

3cf59a8

Merge pull request #59 from barryceelen/patch-1

f0d0bc7

Fix missing "able" in "be able to"

Update EN-Terms-of-Service.md

81de249

Updated for WooPay

Update Privacy-Policy.md

90c0032

Updated for WooPay

Update EN-Terms-of-Service.md

dbf67aa

Update EN-Terms-of-Service.md

cb34f71

WooPay link updates

Update EN-Terms-of-Service.md

13e6bfb

Updated date to match the user-facing TOS page

Update EN-Terms-of-Service.md

8a31f47

Miscellaneous updates and clarifications, including removal of section 16 (Arbitration Agreement) and updates to include certain European user rights.

Update EN-Terms-of-Service.md

0c57f0c

Fixing a typo

Remove repeated paragraph in Wordpress TOS

e4872f9

Merge pull request #60 from TomVeniat/patch-1

26117d6

Remove repeated paragraph in Wordpress TOS

Update Privacy-Policy.md

1214640

Added wp.cloud to the list of our websites.

Update Privacy-Policy.md

84e5b95

Updated the California rights section to apply to additional US states.

Update EN-Terms-of-Service.md

ffad8c2

Miscellaneous updates, like adding USPS's Privacy Act Statement, incorporating our advertising policy, and making clear that Jetpack services are available through various plugins.

Update Privacy-Policy.md

36e2176

Update EN-Terms-of-Service.md

d604680

Added sections for AI features and Built By WordPress.com Express.

Update Privacy-Policy.md

3902515

Update Privacy-Policy.md

2b25fa6

Update EN-Terms-of-Service.md

b9d4852

Miscellaneous updates and clarifications, including changing instances of “WooCommerce” to “Woo."

Update Privacy-Policy.md

a556cc7

Changed instances of “WooCommerce” to “Woo.”

Update EN-Terms-of-Service.md

5be5e1e

Miscellaneous updates, including clarifications to European users’ right to withdrawal as well as our relationship with third-party services sold via Woo.com and WordPress.com.

Update Legal-Guidelines.md

bbd1387

Update Legal-Guidelines.md

0beb883

Offer Letters - start with US

65294eb

Add other offer letters

809d188

Update EN-Terms-of-Service.md

4383a4b

Miscellaneous updates and clarifications, including the addition of Studio and changing instands of "Woo.com" to "WooCommerce.com".

Update EN-Terms-of-Service.md

66b81c6

Update Privacy-Policy.md

4076be5

Removed the outdated list of specific US states covered by the US Privacy Laws section

Update EN-Terms-of-Service.md

3c220c0

Updated for Blaze Pro

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PR-merge master #1

PR-merge master #1

shauvik commented Jul 21, 2019 •

edited

Loading

PR-merge master #1

Are you sure you want to change the base?

PR-merge master #1

Conversation

shauvik commented Jul 21, 2019 • edited Loading

shauvik commented Jul 21, 2019 •

edited

Loading