Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

app/javascript/styles/gabsocial/components.scss

@@ -306,6 +306,9 @@
 	min-height: 23px;
 	overflow-y: auto;
 	flex: 0 2 auto;
+	max-height: 500px;
+	@media screen and (min-width: 320px) and (max-width: 375px) {max-height: 220px;}
+	@media screen and (max-width: 320px) {max-height :130px;}
 }
 
 .reply-indicator__header {

app/views/about/privacy.html.haml

@@ -96,13 +96,20 @@
         %li With your consent.
         %li We may also disclose your personal information:
         %li To comply with any court order, law, or legal process, including to respond to any government or regulatory request.
-        %li To enforce or apply our terms of use and sale and other agreements, including for billing and collection purposes.
+        %li
+          To enforce or apply our
+          = link_to 'terms of use', about_tos_path
+          and
+          = link_to 'sale', about_sales_path
+          and other agreements, including for billing and collection purposes.
         %li If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of Gab AI Inc, our employees, our customers, or any other person.
 
       %h3 Accessing, Correcting and Deleting Your Information
       %p You can review and change your personal information by logging into the Website and visiting your account profile page.
       %p You may also send us an email at support [at] gab [dot] com to request access to, correct or delete any personal information that you have provided to us. We cannot delete your personal information except by also deleting your user account. We may not accommodate a request to change information if we believe the change would violate any law or legal requirement or cause the information to be incorrect.
-      %p If you delete your User Contributions from the Website, copies of your User Contributions may remain viewable in cached and archived pages, or might have been copied or stored by other Website users. Proper access and use of information provided on the Website, including User Contributions, is governed by our Terms of Use.
+      %p
+        If you delete your User Contributions from the Website, copies of your User Contributions may remain viewable in cached and archived pages, or might have been copied or stored by other Website users. Proper access and use of information provided on the Website, including User Contributions, is governed by our
+        = link_to 'Terms of Use.', about_tos_path
 
       %h3 Data Security
       %p We have implemented measures designed to secure your personal information from accidental loss and from unauthorized access, use, alteration, and disclosure. All information you provide to us is stored on our secure servers behind firewalls. Any payment transactions will be encrypted using SSL.

app/views/about/sales.html.haml

@@ -8,7 +8,14 @@
       %p Gab AI Inc (“We” or “Gab”) hereby allow you to access certain premium features or content in exchange for a one-time or recurring fee, as applicable to the relevant features or content, such as our “GabPro” enhanced social media offering (collectively, each a “Paid Service” and collectively the "Paid Services"). Your transactions and any other use of the Paid Services are subject to these Gab Paid Service Terms of Service ("Terms”).
 
       %h3 1. Your Acceptance
-      %p By using a Paid Service, you signify your agreement to (1) these Terms of Sale; and (2) Gab AI Inc’s Terms of Service, Privacy Notice, and Copyright Notice, and all other terms and conditions that generally apply to the Website (as such term is defined in the Terms of Service).  Please read the Terms carefully. If you do not understand the Terms, or do not accept any part of them, then you may not use the Paid Services.
+      %p
+        By using a Paid Service, you signify your agreement to (1) these Terms of Sale; and (2) Gab AI Inc’s
+        = link_to 'Terms of Service', about_tos_path
+        ,
+        = link_to 'Privacy Notice', about_privacy_path
+        , and
+        = link_to 'Copyright Notice', about_dmca_path
+        , and all other terms and conditions that generally apply to the Website (as such term is defined in the Terms of Service).  Please read the Terms carefully. If you do not understand the Terms, or do not accept any part of them, then you may not use the Paid Services.
       %p Each time you place an order for a Paid Service (including when you order individual subscriptions or items of content), you enter into a separate contract for services on these Terms. When you complete a purchase, you signify that you wish to enter into a binding contract for the provision of the applicable Paid Services.
 
       %h3 2. Payment, Refund and Cancellation Policy

app/views/about/terms.html.haml

@@ -10,10 +10,27 @@
 
       %h3 Acceptance of the Terms of Use
        
-      %p These terms of use are entered into by and between You and GAB AI INC (”Company,” “we,” or “us”). The following terms and conditions, together with the Copyright Policy, the Privacy Policy and any other documents expressly incorporated by reference (collectively, “Terms of Use”), govern your access to and use of GAB.COM and DISSENTER.COM and other web properties of Gab AI Inc, including any content, functionality, and services offered on or through GAB.COM and DISSENTER.COM (the “Website”), whether as a guest or a registered user.
+      %p
-      %p Please read the Terms of Use carefully before you start to use the Website. By using the Website, you accept and agree to be bound and abide by these Terms of Use and our Privacy Policy, incorporated herein by reference. If you do not want to agree to these Terms of Use or the Privacy Policy, you must not access or use the Website.
+        These terms of use are entered into by and between You and GAB AI INC (”Company,” “we,” or “us”). The following terms and conditions, together with the
+        = link_to 'Copyright Policy', about_dmca_path
+        , the
+        = link_to 'Privacy Policy', about_privacy_path
+        and any other documents expressly incorporated by reference (collectively, “Terms of Use”), govern your access to and use of GAB.COM and DISSENTER.COM and other web properties of Gab AI Inc, including any content, functionality, and services offered on or through GAB.COM and DISSENTER.COM (the “Website”), whether as a guest or a registered user.
+      %p
+        Please read the Terms of Use carefully before you start to use the Website. By using the Website, you accept and agree to be bound and abide by these Terms of Use and our
+        = link_to 'Privacy Policy', about_privacy_path
+        , incorporated herein by reference. If you do not want to agree to these Terms of Use or the
+        = link_to 'Privacy Policy', about_privacy_path
+        , you must not access or use the Website.
       %p This Website is offered and available to users who are 18 years of age or older. By using this Website, you represent and warrant that you are of legal age to form a binding contract with the Company and meet all of the foregoing eligibility requirements. If you do not meet all of these requirements, you must not access or use the Website.
-      %p Please be aware of the Terms of Sale, Privacy Policy, and Copyright Policy which are incorporated into these Terms of Use by reference.
+      %p
+        Please be aware of the
+        = link_to 'Terms of Sale', about_sales_path
+        ,
+        = link_to 'Privacy Policy', about_privacy_path
+        , and
+        = link_to 'Copyright Policy', about_dmca_path
+        which are incorporated into these Terms of Use by reference.
 
       %h3 Changes to the Terms of Use 
       %p We may revise and update these Terms of Use from time to time in our sole discretion. All changes are effective immediately when we post them, and apply to all access to and use of the Website thereafter. Your continued use of the Website following the posting of revised Terms of Use means that you accept and agree to the changes. You are expected to check this page frequently so you are aware of any changes, as they are binding on you.
@@ -27,7 +44,11 @@
         %li Making all arrangements necessary for you to have access to the Website.
         %li Ensuring that all persons who access the Website through your internet connection are aware of these Terms of Use and comply with them.
 
-      %p To access the Website or some of the resources it offers, you may be asked to provide certain registration details or other information. It is a condition of your use of the Website that all the information you provide on the Website is correct, current, and complete. You agree that all information you provide to register with this Website or otherwise, including, but not limited to, through the use of any interactive features on the Website, is governed by our Privacy Policy, and you consent to all actions we take with respect to your information consistent with our Privacy Policy.
+      %p
+        To access the Website or some of the resources it offers, you may be asked to provide certain registration details or other information. It is a condition of your use of the Website that all the information you provide on the Website is correct, current, and complete. You agree that all information you provide to register with this Website or otherwise, including, but not limited to, through the use of any interactive features on the Website, is governed by our
+        = link_to 'Privacy Policy', about_privacy_path
+        , and you consent to all actions we take with respect to your information consistent with our
+        = link_to 'Privacy Policy.', about_privacy_path
       %p If you choose, or are provided with, a user name, password, or any other piece of information as part of our security procedures, you must treat such information as confidential, and you must not disclose it to any other person or entity. You also acknowledge that your account is personal to you and agree not to provide any other person with access to this Website or portions of it using your user name, password, or other security information. You agree to notify us immediately of any unauthorized access to or use of your user name or password or any other breach of security. You should use particular caution when accessing your account from a public or shared computer so that others are not able to view or record your password or other personal information.
       %p We have the right to disable any user name, password, or other identifier, whether chosen by you or provided by us, at any time if we believe you have violated any provision of these Terms of Use.
 
@@ -109,7 +130,9 @@
         %li Interfere with the operation of any computer.
         %li Be obscene, sexually explicit or pornographic. Note that mere nudity e.g. as a form of protest or for educational/medical reasons will not fall foul of this rule.
         %li Infringe any patent, trademark, trade secret, copyright, or other intellectual property or other rights of any other person.
-        %li Violate the legal rights (including the rights of publicity and privacy) of others or contain any material that could give rise to any civil or criminal liability under applicable laws or regulations of the United States or that otherwise may be in conflict with these Terms of Use and our Privacy Policy.
+        %li
+          Violate the legal rights (including the rights of publicity and privacy) of others or contain any material that could give rise to any civil or criminal liability under applicable laws or regulations of the United States or that otherwise may be in conflict with these Terms of Use and our
+          = link_to 'Privacy Policy.', about_privacy_path
         %li Impersonate any person, or misrepresent your identity or affiliation with any person or organization, for a purpose not protected by the First Amendment.
         %li Involve commercial activities relating to finance, investments or gambling, such as contests and sweepstakes, penny stock promotion, money transmission, or Initial Coin Offerings; or the trade of live or endangered animals or animal parts, or anything that portrays or encourages the abuse of animals.
         %li Give the impression that they emanate from or are endorsed by us or any other person or entity, if this is not the case.
@@ -118,7 +141,10 @@
       %p Although our Content Standards, following the First Amendment, do not proscribe offensive speech, we strongly encourage you to ensure that your User Contributions are cordial and civil. The foundation of a free society requires people to peacefully settle their differences through dialogue and debate. Gab exists to promote the free flow of information online. It is our view that the responsible exercise of one’s free speech rights is its own reward and, as a general rule, the most well-respected online publishers tend to be the ones who behave the most civilly and put forward their arguments most intelligently.
 
       %h3 Copyright Infringement
-      %p If you believe that any User Contributions violate your copyright, please see our Copyright Policy for instructions on sending us a notice of copyright infringement. It is the policy of the Company to terminate the user accounts of repeat infringers.
+      %p
+        If you believe that any User Contributions violate your copyright, please see our
+        = link_to 'Copyright Policy', about_dmca_path
+        for instructions on sending us a notice of copyright infringement. It is the policy of the Company to terminate the user accounts of repeat infringers.
 
       %h3 Reliance on Information Posted
       %p The information presented on or through the Website is made available solely for general information purposes. We do not warrant the accuracy, completeness, or usefulness of this information. Any reliance you place on such information is strictly at your own risk. We disclaim all liability and responsibility arising from any reliance placed on such materials by you or any other visitor to the Website, or by anyone who may be informed of any of its contents.
@@ -128,10 +154,16 @@
       %p We may update the content on this Website from time to time, but its content is not necessarily complete or up-to-date. Any of the material on the Website may be out of date at any given time, and we are under no obligation to update such material.
       ‌
       %h3 Information About You and Your Visits to the Website
-      %p All information we collect on this Website is subject to our Privacy Policy. By using the Website, you consent to all actions taken by us with respect to your information in compliance with the Privacy Policy.
+      %p
+        All information we collect on this Website is subject to our
+        = link_to 'Privacy Policy.', about_privacy_path
+        By using the Website, you consent to all actions taken by us with respect to your information in compliance with the
+        = link_to 'Privacy Policy.', about_privacy_path
       ‌
       %h3 Online Purchases and Other Terms and Conditions
-      %p All purchases through our site or other transactions for the sale of services formed through the Website, or resulting from visits made by you, are governed by our Terms of Sale.
+      %p
+        All purchases through our site or other transactions for the sale of services formed through the Website, or resulting from visits made by you, are governed by our
+        = link_to 'Terms of Sale.', about_sales_path
       %p Additional terms and conditions may also apply to specific portions, services, or features of the Website. All such additional terms and conditions are hereby incorporated by this reference into these Terms of Use.
       ‌
       %h3 Linking to the Website and Social Media Features
@@ -180,11 +212,21 @@
       %p If any provision of these Terms of Use is held by a court or other tribunal of competent jurisdiction to be invalid, illegal, or unenforceable for any reason, such provision shall be eliminated or limited to the minimum extent such that the remaining provisions of the Terms of Use will continue in full force and effect.
 
       %h3 Entire Agreement
-      %p The Terms of Use, our Privacy Policy, our Copyright Policy and any Terms of Sale constitute the sole and entire agreement between you and Gab AI Inc. regarding the Website and supersede all prior and contemporaneous understandings, agreements, representations, and warranties, both written and oral, regarding the Website.
+      %p
+        The Terms of Use, our
+        = link_to 'Privacy Policy', about_privacy_path
+        , our
+        = link_to 'Copyright Policy', about_dmca_path
+        and any
+        = link_to 'Terms of Sale', about_sales_path
+        constitute the sole and entire agreement between you and Gab AI Inc. regarding the Website and supersede all prior and contemporaneous understandings, agreements, representations, and warranties, both written and oral, regarding the Website.
       ‌
       %h3 Your Comments and Concerns
       %p This Website is operated by GAB AI INC.
-      %p All notices of copyright infringement claims should be sent pursuant to the terms of our Copyright Policy in the manner and by the means set out therein.
+      %p
+        All notices of copyright infringement claims should be sent pursuant to the terms of our
+        = link_to 'Copyright Policy', about_dmca_path
+        in the manner and by the means set out therein.
       %p All other feedback, comments, requests for technical support, and other communications relating to the Website should be directed to
 
       %p