Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR-merge master #1

Open
wants to merge 168 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
a28aaee
Removed section regarding advisory message
Apr 16, 2018
83884c1
Update language and added markdown
Apr 16, 2018
3c04fba
Fixed link and added markdown
Apr 16, 2018
a8130e5
Create WooCommerce Use Terms
jennyzhu May 11, 2018
51967f2
Create Polldaddy
jennyzhu May 13, 2018
f2ecbc8
Delete Polldaddy
jennyzhu May 13, 2018
4dabc64
Create Polldaddy Terms and Conditions
jennyzhu May 13, 2018
54d0c0b
Update Polldaddy Terms and Conditions
jennyzhu May 14, 2018
ddd8fd7
Update Automattic Ads.md
jennyzhu May 14, 2018
0bda1cd
Update WooCommerce Use Terms
jennyzhu May 14, 2018
e48de85
Update Privacy-Policy.md
jennyzhu May 14, 2018
98cdfb8
Update EN-Terms-of-Service.md
jennyzhu May 14, 2018
86999f0
Update Automattic Ads.md
jennyzhu May 14, 2018
8b67dd6
Rename Polldaddy Terms and Conditions to Polldaddy Terms and Conditio…
jennyzhu May 14, 2018
c980cfd
Rename WooCommerce Use Terms to WooCommerce Use Terms.md
jennyzhu May 14, 2018
e7ba046
Create Privacy Notice for Visitors to Our Users’ Sites.md
jennyzhu May 14, 2018
c4a161c
Small typo you -> your
ivanpenchev May 20, 2018
8c7b9b4
Update filename
clickysteve Jun 4, 2018
72a5e00
Update file name
clickysteve Jun 4, 2018
70d4825
Create Cookie-Policy.md
clickysteve Jun 4, 2018
ad08f62
Update Privacy-Policy.md
jennyzhu Jun 4, 2018
01f4643
Update Privacy-Policy.md
jennyzhu Jun 21, 2018
42053c7
Update EN-Terms-of-Service.md
clickysteve Aug 21, 2018
82db5c4
Merge pull request #30 from ivanpenchev/patch-1
clickysteve Aug 21, 2018
8164566
Update Privacy-Policy.md
hollyannehogan Sep 25, 2018
4f66996
Update Legal-Guidelines.md
jennyzhu Oct 12, 2018
070771d
Update Legal-Guidelines.md
jennyzhu Oct 16, 2018
d3f0041
Update Privacy-Policy.md
jennyzhu Nov 6, 2018
7b9e223
Update Privacy-Notice-for-Visitors-to-Our-Users-Sites.md
jennyzhu Nov 6, 2018
9f73d2e
Update Polldaddy Terms and Conditions.md
jennyzhu Nov 6, 2018
4b4fe91
Update Polldaddy Terms and Conditions.md
jennyzhu Nov 6, 2018
35f75a5
Update Polldaddy Terms and Conditions.md
jennyzhu Nov 6, 2018
5187cc5
Update Privacy-Notice-for-Visitors-to-Our-Users-Sites.md
jennyzhu Nov 8, 2018
37109f1
Update Automattic Ads.md
jennyzhu Nov 12, 2018
b7b896c
Update Automattic Ads.md
jennyzhu Nov 12, 2018
8d409fa
Update Legal-Guidelines.md
jennyzhu Nov 29, 2018
f32bc66
Update EN-Terms-of-Service.md
jennyzhu Dec 18, 2018
292d4ab
Update Legal-Guidelines.md
jennyzhu Jan 7, 2019
de6c276
Update Privacy-Policy.md
jennyzhu Feb 1, 2019
243397c
Update Privacy-Policy.md
jennyzhu Mar 13, 2019
1ddf0e4
Update Privacy-Policy.md
jennyzhu Apr 1, 2019
612b50f
Update EN-Terms-of-Service.md
jennyzhu Apr 1, 2019
c669eac
Delete AR-شروط الخدمة.md
jennyzhu Apr 1, 2019
433927a
Delete HE-תנאי השירו.md
jennyzhu Apr 1, 2019
6fd229e
Delete ZH-TW-服務條款.md
jennyzhu Apr 1, 2019
fc4683c
Delete ZH-CN-服务条款.md
jennyzhu Apr 1, 2019
3a45505
Delete TR-Hizmet-Koşulları.md
jennyzhu Apr 1, 2019
2bd76f6
Delete SV-Användarvillkor.md
jennyzhu Apr 1, 2019
5377121
Delete RU-Условия-предоставления-услуг.md
jennyzhu Apr 1, 2019
f743a66
Delete PT-BR-Termos-de-Serviço.md
jennyzhu Apr 1, 2019
4508201
Delete NL-Servicevoorwaarden.md
jennyzhu Apr 1, 2019
eae8969
Delete KO-이용-약관.md
jennyzhu Apr 1, 2019
ffc7132
Delete JA-利用規約.md
jennyzhu Apr 1, 2019
3b424cc
Delete IT-Termini-di-servizio.md
jennyzhu Apr 1, 2019
14e1d88
Delete ID-Ketentuan-Layanan.md
jennyzhu Apr 1, 2019
a2516af
Update EN-Terms-of-Service.md
jennyzhu Apr 1, 2019
a90641a
Update Cookie-Policy.md
jennyzhu Apr 3, 2019
e50c4c4
Update EN-Terms-of-Service.md
jennyzhu Apr 5, 2019
8ba3e72
Update EN-Terms-of-Service.md
jennyzhu May 7, 2019
13121fa
Update EN-Terms-of-Service.md
jennyzhu May 9, 2019
8e9dbda
Delete DE-Geschäftsbedingungen.md
jennyzhu May 10, 2019
42fd685
Delete FR-Conditions-d’utilisation.md
jennyzhu May 10, 2019
c62bdf7
Delete ES-Condiciones-de-servicio.md
jennyzhu May 10, 2019
7ad4e0c
Update WooCommerce Use Terms.md
jennyzhu May 13, 2019
8717b7e
Update Cookie-Policy.md
jennyzhu May 21, 2019
c0c49a5
Update Privacy-Policy.md
jennyzhu May 31, 2019
901e001
Update EN-Terms-of-Service.md
jennyzhu May 31, 2019
c09afc0
Delete WooCommerce Use Terms.md
jennyzhu Jun 20, 2019
8c18450
Rename Polldaddy Terms and Conditions.md to Crowdsignal Terms and Con…
jennyzhu Jun 21, 2019
d7015d0
Rename Terms of Service/Polldaddy/Crowdsignal Terms and Conditions.md…
jennyzhu Jun 21, 2019
cff9dcd
Update EN-Terms-of-Service.md
jennyzhu Jul 12, 2019
2c79671
Fix typo in one word
aniravi24 Jul 31, 2019
ab6dcd4
Update Cookie-Policy.md
jennyzhu Aug 19, 2019
e1b0542
Merge pull request #36 from aniravi24/patch-1
jennyzhu Sep 19, 2019
2a4e238
Update Cookie-Policy.md
jennyzhu Oct 2, 2019
936f149
Update Privacy-Policy.md
jennyzhu Oct 2, 2019
cffc86a
Update Privacy-Notice-for-Visitors-to-Our-Users-Sites.md
jennyzhu Oct 2, 2019
1000135
Update Privacy-Policy.md
jennyzhu Oct 3, 2019
854e5a7
Update Legal-Guidelines.md
davidwatkis Oct 14, 2019
09bf123
Update EN-Terms-of-Service.md
jennyzhu Nov 4, 2019
fea94ed
Update Cookie-Policy.md
jennyzhu Nov 12, 2019
054088e
Update Privacy-Policy.md
jennyzhu Dec 31, 2019
4da44ad
Update Privacy-Policy.md
jennyzhu Jan 2, 2020
dd776e2
Update EN-Terms-of-Service.md
jennyzhu Jan 30, 2020
60f4b35
Update EN-Terms-of-Service.md
jennyzhu Feb 13, 2020
c895b78
Update EN-Terms-of-Service.md
jennyzhu Feb 22, 2020
b27b179
Update Privacy-Policy.md
jennyzhu Feb 22, 2020
e12df08
Update Cookie-Policy.md
catscheer May 4, 2020
e9ed685
Update EN-Terms-of-Service.md
jennyzhu May 21, 2020
2815908
Update Cookie-Policy.md
jennyzhu May 26, 2020
986bd61
Update Privacy-Policy.md
catscheer Jun 29, 2020
03d6e1e
Update User-Guidelines.md
kevko Jul 3, 2020
35e467f
Update User-Guidelines.md
kevko Jul 3, 2020
5c51151
Update User-Guidelines.md
kevko Jul 3, 2020
ac7b4ba
Update User-Guidelines.md
kevko Jul 4, 2020
c11e594
Update User-Guidelines.md
kevko Jul 4, 2020
85952c8
Update User-Guidelines.md
kevko Jul 4, 2020
8d0fe7e
Update EN-Terms-of-Service.md
jennyzhu Jul 10, 2020
2520d19
Create Store-Guidelines.md
kevko Jul 15, 2020
93f094a
Update Privacy-Policy.md
jennyzhu Jul 15, 2020
3ebca21
Update Automattic Ads.md
jennyzhu Jul 21, 2020
0a18eb2
Update Privacy-Policy.md
jennyzhu Aug 1, 2020
a00a823
Update EN-Terms-of-Service.md
jennyzhu Aug 12, 2020
1158487
Delete Store-Guidelines.md
clickysteve Oct 5, 2020
1140cdc
Delete User-Guidelines.md
clickysteve Oct 5, 2020
c7458e1
Create readme.md
clickysteve Oct 5, 2020
e143353
Update readme.md
clickysteve Oct 5, 2020
116313d
Update Privacy-Notice-for-Visitors-to-Our-Users-Sites.md
jennyzhu Oct 13, 2020
79e4b19
Update Privacy-Policy.md
jennyzhu Oct 13, 2020
7e00679
Update EN-Terms-of-Service.md
jennyzhu Oct 13, 2020
d5278b6
Update Cookie-Policy.md
catscheer Oct 29, 2020
c4f7f4e
Update EN-Terms-of-Service.md
jennyzhu Oct 29, 2020
9b0d7e2
Update Cookie-Policy.md
catscheer Dec 18, 2020
bfd58cf
Update Privacy-Policy.md
catscheer Jan 5, 2021
aa44048
Update EN-Terms-of-Service.md
catscheer Jan 5, 2021
6245f2e
Update EN-Terms-of-Service.md
catscheer Jan 25, 2021
e4d7734
Update Cookie-Policy.md
catscheer Jan 26, 2021
6e9681a
Update Cookie-Policy.md
catscheer Mar 5, 2021
62ff480
Update Cookie-Policy.md
catscheer Mar 17, 2021
f5a76b9
Update EN-Terms-of-Service.md
catscheer Mar 30, 2021
56db82b
Update EN-Terms-of-Service.md
catscheer Mar 30, 2021
8ff6748
Update EN-Terms-of-Service.md
catscheer May 5, 2021
b5ed162
Privacy policy: Add missing full stop
guarani May 7, 2021
5e0c66a
Merge pull request #48 from Automattic/add-missing-full-stop
guarani May 10, 2021
9e6b801
Update Legal-Guidelines.md
AinslieG Jun 17, 2021
d6c8856
Update EN-Terms-of-Service.md
jennyzhu Jun 25, 2021
1fa93be
Merge pull request #50 from jennyzhu/patch-1
catscheer Jun 25, 2021
48d8a1b
Update Privacy-Policy.md
catscheer Jun 30, 2021
3377510
Update EN-Terms-of-Service.md
jennyzhu Jul 7, 2021
ef6531d
Update automattic.com to use HTTPS
josephscott Aug 10, 2021
2439b06
Merge pull request #52 from Automattic/josephscott-patch-1
josephscott Aug 20, 2021
8110749
Update Cookie-Policy.md
catscheer Sep 7, 2021
a222305
Update Privacy-Policy.md
catscheer Oct 8, 2021
42266dd
Update EN-Terms-of-Service.md
jennyzhu Oct 18, 2021
1555858
Update Privacy-Policy.md
catscheer Nov 22, 2021
d28e929
Update EN-Terms-of-Service.md
catscheer Nov 22, 2021
16382e9
Update EN-Terms-of-Service.md
brv Dec 19, 2021
fdc7422
Merge pull request #57 from brv/master
jennyzhu Dec 20, 2021
8ec8a54
Update Cookie-Policy.md
jennyzhu Feb 14, 2022
3cf59a8
Fix missing "able" in "be able to"
barryceelen Mar 31, 2022
f0d0bc7
Merge pull request #59 from barryceelen/patch-1
jennyzhu Mar 31, 2022
81de249
Update EN-Terms-of-Service.md
jennyzhu Apr 27, 2022
90c0032
Update Privacy-Policy.md
jennyzhu Apr 27, 2022
dbf67aa
Update EN-Terms-of-Service.md
melanieharari May 18, 2022
cb34f71
Update EN-Terms-of-Service.md
melanieharari May 18, 2022
13e6bfb
Update EN-Terms-of-Service.md
melanieharari May 18, 2022
8a31f47
Update EN-Terms-of-Service.md
jennyzhu Jul 5, 2022
0c57f0c
Update EN-Terms-of-Service.md
jennyzhu Jul 13, 2022
e4872f9
Remove repeated paragraph in Wordpress TOS
TomVeniat Sep 30, 2022
26117d6
Merge pull request #60 from TomVeniat/patch-1
jennyzhu Sep 30, 2022
1214640
Update Privacy-Policy.md
jennyzhu Oct 18, 2022
84e5b95
Update Privacy-Policy.md
catscheer Dec 30, 2022
ffad8c2
Update EN-Terms-of-Service.md
jennyzhu Mar 3, 2023
36e2176
Update Privacy-Policy.md
catscheer Mar 17, 2023
d604680
Update EN-Terms-of-Service.md
jennyzhu Jun 5, 2023
3902515
Update Privacy-Policy.md
catscheer Jul 12, 2023
2b25fa6
Update Privacy-Policy.md
catscheer Jul 12, 2023
b9d4852
Update EN-Terms-of-Service.md
jennyzhu Nov 2, 2023
a556cc7
Update Privacy-Policy.md
jennyzhu Nov 2, 2023
5be5e1e
Update EN-Terms-of-Service.md
jennyzhu Jan 4, 2024
bbd1387
Update Legal-Guidelines.md
clickysteve Jan 29, 2024
0beb883
Update Legal-Guidelines.md
clickysteve Jan 29, 2024
65294eb
Offer Letters - start with US
nickmomrik Feb 14, 2024
809d188
Add other offer letters
nickmomrik Feb 14, 2024
4383a4b
Update EN-Terms-of-Service.md
catscheer Apr 22, 2024
66b81c6
Update EN-Terms-of-Service.md
catscheer Apr 22, 2024
4076be5
Update Privacy-Policy.md
catscheer Apr 22, 2024
3c220c0
Update EN-Terms-of-Service.md
jennyzhu Jun 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 202 additions & 0 deletions Cookie-Policy.md

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions DMCA/Predefined Replies/To User/DMCA Received - Full Site Copied
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
Hi there,
We have received the [DMCA takedown notice](http://en.support.wordpress.com/copyright-and-the-dmca) below regarding material published on your WordPress.com site, which means the complainant is asserting ownership of this material and claiming that your use of it is not permitted by them or the law. We have disabled public access to the material by suspending your site due to the large percentage of content at issue.

We've received the DMCA notice (http://chillingeffects.org/dmca512/faq.cgi#QID130) below regarding material published on your WordPress.com site, which means the complainant is asserting ownership of this material and claiming that your use of it is not permitted by him/her or the law. Your blog was suspended upon receipt of a valid DMCA complaint that a large percentage of the content on the site was infringing on the copyright rights of the complainant.
If you would like to resume blogging on WordPress.com, please confirm that you understand this notice and that you agree to remove all of the content at issue.

If you believe your usage of this material falls under the Fair Use provision of US Copyright Law, it’s important that you submit a formal DMCA counter-notice to ensure that your WordPress.com site remains operational. You can learn more about fair use here:

https://en.support.wordpress.com/fair-use/

If you believe your usage of this material is not fair use but are willing to remove all the infringing content then I will restore your site to you as a private site. After you have removed the infringing content you will be able to adjust your settings to again make the site publicly viewable.
Alternatively, if you believe that this DMCA takedown notice was received in error, or if you believe your usage of this material would be considered fair use, it’s important that you submit a formal DMCA counter notice so that we can restore access to your site. If you submit a valid counter notice, we will return the material to your site in 10 business days if the complainant does not reply with legal action.

Please refer to the following pages for more information:

http://en.support.wordpress.com/counter-notice/
http://automattic.com/dmca/dmca-counter-notice/
[Countering a DMCA Notice](http://en.support.wordpress.com/counter-notice/)
[Digital Millenium Copyright Act – Counter Notice](http://automattic.com/dmca/dmca-counter-notice/)

Please note that republishing the material yourself on another blog, without permission from the copyright holder (even after you have submitted a counter notice) will result in the permanent suspension of your other WordPress.com site and/or account.

Thank you.

-- BEGIN NOTICE --
BEGIN NOTICE

-- END NOTICE --
END NOTICE
23 changes: 6 additions & 17 deletions DMCA/Predefined Replies/To User/Processed Notice.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
Hi there,
We have received the [DMCA takedown notice](http://en.support.wordpress.com/copyright-and-the-dmca) below regarding material published on your WordPress.com site, which means the complainant is asserting ownership of this material and claiming that your use of it is not permitted by them or the law. We have disabled public access to the material by suspending your site due to the large percentage of content at issue.

We’ve received the DMCA takedown notice (http://en.support.wordpress.com/copyright-and-the-dmca) below regarding material published on your WordPress.com site, which means the complainant is asserting ownership of this material and claiming that your use of it is not permitted by him/her or the law. As required by the DMCA, we have disabled public access to the material.
If you would like to resume blogging on WordPress.com, please confirm that you understand this notice and that you agree to remove all of the content at issue.

Repeated incidents of copyright infringement will also lead to the permanent suspension of your WordPress.com site. We certainly don’t want that to happen, so please delete any other material you may have uploaded for which you don’t have the necessary rights and refrain from uploading additional material that you do not have permission to upload. Although we can’t provide legal advice, the following link provides resources that might help you make this determination:

https://en.support.wordpress.com/counter-notice/#what-is-fair-use

If you’d like, follow the instructions in the applicable point below to remove the DMCA advisory message from your site. If the content in question is:

* An entire page/post, delete it completely.
* Part of a page/post, (1) remove the content in question, then (2) reply to this e-mail to request the removal of the DMCA notice that was placed on your site.
* A media file, such as an image or PDF, (1) remove the media file from the page/post where it appeared, and (2) delete the media file from your Media Library.

Alternatively, if you believe that this DMCA takedown notice was received in error, or if you believe your usage of this material would be considered fair use, it’s important that you submit a formal DMCA counter notice to ensure that your WordPress.com site remains operational. If you submit a valid counter notice, we will return the material to your site in 10 business days if the complainant does not reply with legal action.
Alternatively, if you believe that this DMCA takedown notice was received in error, or if you believe your usage of this material would be considered fair use, it’s important that you submit a formal DMCA counter notice so that we can restore access to your site. If you submit a valid counter notice, we will return the material to your site in 10 business days if the complainant does not reply with legal action.

Please refer to the following pages for more information:

http://en.support.wordpress.com/counter-notice/

http://automattic.com/dmca/dmca-counter-notice/
[Countering a DMCA Notice](http://en.support.wordpress.com/counter-notice/)
[Digital Millenium Copyright Act – Counter Notice](http://automattic.com/dmca/dmca-counter-notice/)

Please note that republishing the material yourself, without permission from the copyright holder (even after you have submitted a counter notice) will result in the permanent suspension of your WordPress.com site and/or account.
Please note that republishing the material yourself on another blog, without permission from the copyright holder (even after you have submitted a counter notice) will result in the permanent suspension of your other WordPress.com site and/or account.

Thank you.

Expand Down
1 change: 1 addition & 0 deletions DMCA/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Please note that this folder and its contents are no longer actively maintained, but it is left available for reference purposes.
Loading