diff --git a/resources/views/site/help/discover.blade.php b/resources/views/site/help/discover.blade.php index 82684b163..397dbff8a 100644 --- a/resources/views/site/help/discover.blade.php +++ b/resources/views/site/help/discover.blade.php @@ -10,33 +10,33 @@

How to use Discover

Discover Categories NEW

Discover Categories are a new feature that may not be supported on every Pixelfed instance.

Personalized Discover NEW

Discover posts based on hashtags you've used before. This feature might not be supported on every Pixelfed instance.

Discover Tips
diff --git a/resources/views/site/help/getting-started.blade.php b/resources/views/site/help/getting-started.blade.php index f29567337..452b4537a 100644 --- a/resources/views/site/help/getting-started.blade.php +++ b/resources/views/site/help/getting-started.blade.php @@ -6,7 +6,7 @@

{{__('helpcenter.gettingStarted')}}

-

Welcome to Pixelfed!

+

Welcome to Pixelfed!

    1. {{route('settings')}}.
    2. You should see the Name, Website, and Bio fields.
    3. Change the desired fields, and then click the Submit button.
      4. @@ -36,7 +36,7 @@

-

Privacy

+

Privacy

    1. {{route('settings.privacy')}}.
    2. Check the Private Account checkbox.
    3. The confirmation modal will popup and ask you if you want to keep existing followers and disable new follow requests
      4. @@ -99,7 +99,7 @@

--}}
-

Security

+

Security

    1. {{config('pixelfed.domain.app')}}
    2. Tap or click the menu and select Settings
    3. Scroll down and click on the Temporarily Disable Account link.
      4. @@ -178,7 +178,7 @@ @endif

      After you delete your account, you can't sign up again with the same username on this instance or add that username to another account on this instance, and we can't reactivate deleted accounts.

      To permanently delete your account:

      -
        +
        1. Go to the Delete Your Account page. If you're not logged into pixelfed on the web, you'll be asked to log in first. You can't delete your account from within a mobile app.
        2. Confirm your account password.
        3. On the Delete Your Account page click or tap on the Permanently Delete My Account button.
          4. diff --git a/resources/views/site/opensource.blade.php b/resources/views/site/opensource.blade.php index a00a42f88..7ddb492fb 100644 --- a/resources/views/site/opensource.blade.php +++ b/resources/views/site/opensource.blade.php @@ -7,7 +7,7 @@
-

The software that powers this website is called PixelFed and anyone can download the source code and run their own instance!

+

The software that powers this website is called Pixelfed and anyone can download or view the source code and run their own instance!

@endsection diff --git a/resources/views/site/privacy.blade.php b/resources/views/site/privacy.blade.php index e6fda0b2a..0a74398a7 100644 --- a/resources/views/site/privacy.blade.php +++ b/resources/views/site/privacy.blade.php @@ -8,7 +8,7 @@
1. What information do we collect?
-
    +
    • Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography and avatar image are always listed publicly.
      • @@ -24,8 +24,8 @@
    2. What do we use your information for?
    -

    Any of the information we collect from you may be used in the following ways:

    -
      +

      Any of the information we collect from you may be used in the following ways:

      +
      • To provide the core functionality of PixelFed. You can only interact with other people’s content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
        • @@ -38,12 +38,12 @@
      3. How do we protect your information?
      -

      We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.

      +

      We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.

      4. What is our data retention policy?
      -

      We will make a good faith effort to:

      -
        +

        We will make a good faith effort to:

        +
        • Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
          • @@ -54,32 +54,32 @@ You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
        -

        You may irreversibly delete your account at any time.

        +

        You may irreversibly delete your account at any time.

        5. Do we use cookies?
        -

        Yes. Cookies are small files that a site or its service provider transfers to your computer’s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account. +

        Yes. Cookies are small files that a site or its service provider transfers to your computer’s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.

        -

        We use cookies to understand and save your preferences for future visits.

        +

        We use cookies to understand and save your preferences for future visits.

        6. Do we disclose any information to outside parties?
        -

        We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.

        -

        Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.

        -

        When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.

        +

        We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.

        +

        Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.

        +

        When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.

        7. Site usage by children
        -

        If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.

        +

        If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.

        -

        If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.

        +

        If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.

        -

        Law requirements can be different if this server is in another jurisdiction.

        +

        Law requirements can be different if this server is in another jurisdiction.

        8. Changes to our Privacy Policy
        -

        If we decide to change our privacy policy, we will post those changes on this page.

        +

        If we decide to change our privacy policy, we will post those changes on this page.

        -

        This document is CC-BY-SA. It was last updated Jun 12, 2018.

        +

        This document is CC-BY-SA. It was last updated Jun 12, 2018.

        -

        Originally adapted from the Mastodon privacy policy.

        +

        Originally adapted from the Mastodon privacy policy.

@endsection diff --git a/resources/views/site/terms.blade.php b/resources/views/site/terms.blade.php index 1264eb951..341388d6f 100644 --- a/resources/views/site/terms.blade.php +++ b/resources/views/site/terms.blade.php @@ -7,11 +7,11 @@
1. Terms
-

By accessing the website at {{config('app.url')}}, you are agreeing to be bound by these terms of service, all applicable laws and regulations, and agree that you are responsible for compliance with any applicable local laws. If you do not agree with any of these terms, you are prohibited from using or accessing this site. The materials contained in this website are protected by applicable copyright and trademark law.

+

By accessing the website at {{config('app.url')}}, you are agreeing to be bound by these terms of service, all applicable laws and regulations, and agree that you are responsible for compliance with any applicable local laws. If you do not agree with any of these terms, you are prohibited from using or accessing this site. The materials contained in this website are protected by applicable copyright and trademark law.

2. Use License
-
    +
    1. Permission is granted to temporarily download one copy of the materials (information or software) on Pixelfed's website for personal, non-commercial transitory viewing only. This is the grant of a license, not a transfer of title, and under this license you may not: -
        +
        1. modify or copy the materials;
        2. use the materials for any commercial purpose, or for any public display (commercial or non-commercial);
        3. attempt to decompile or reverse engineer any software contained on Pixelfed's website;
          4. @@ -22,22 +22,22 @@
        4. This license shall automatically terminate if you violate any of these restrictions and may be terminated by Pixelfed at any time. Upon terminating your viewing of these materials or upon the termination of this license, you must destroy any downloaded materials in your possession whether in electronic or printed format.
        3. Disclaimer
        -
          +
          1. The materials on Pixelfed's website are provided on an 'as is' basis. Pixelfed makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties including, without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights.
          2. Further, Pixelfed does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its website or otherwise relating to such materials or on any sites linked to this site.
          4. Limitations
          -

          In no event shall Pixelfed or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption) arising out of the use or inability to use the materials on Pixelfed's website, even if Pixelfed or a Pixelfed authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.

          +

          In no event shall Pixelfed or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption) arising out of the use or inability to use the materials on Pixelfed's website, even if Pixelfed or a Pixelfed authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.

          5. Accuracy of materials
          -

          The materials appearing on Pixelfed's website could include technical, typographical, or photographic errors. Pixelfed does not warrant that any of the materials on its website are accurate, complete or current. Pixelfed may make changes to the materials contained on its website at any time without notice. However Pixelfed does not make any commitment to update the materials.

          +

          The materials appearing on Pixelfed's website could include technical, typographical, or photographic errors. Pixelfed does not warrant that any of the materials on its website are accurate, complete or current. Pixelfed may make changes to the materials contained on its website at any time without notice. However Pixelfed does not make any commitment to update the materials.

          6. Links
          -

          Pixelfed has not reviewed all of the sites linked to its website and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by Pixelfed of the site. Use of any such linked website is at the user's own risk.

          +

          Pixelfed has not reviewed all of the sites linked to its website and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by Pixelfed of the site. Use of any such linked website is at the user's own risk.

          7. Modifications
          -

          Pixelfed may revise these terms of service for its website at any time without notice. By using this website you are agreeing to be bound by the then current version of these terms of service.

          +

          Pixelfed may revise these terms of service for its website at any time without notice. By using this website you are agreeing to be bound by the then current version of these terms of service.

          8. Governing Law
          -

          These terms and conditions are governed by and construed in accordance with the laws of Canada and you irrevocably submit to the exclusive jurisdiction of the courts in that State or location.

          +

          These terms and conditions are governed by and construed in accordance with the laws of Canada and you irrevocably submit to the exclusive jurisdiction of the courts in that State or location.

          9. Additional Rules
          -

          This website does not have any additional rules.

          +

          This website does not have any additional rules.

          @endsection