Merge pull request #175 from CaptainFact/staging

Release 0.8.13

.eslintrc.yml

@@ -36,6 +36,7 @@ rules:
   import/no-named-as-default: ['warn']
   no-restricted-globals: ["error", "event", "fdescribe"]
   no-mixed-operators: ['warn']
+  react/destructuring-assignment: off
   react/no-multi-comp: ['warn']
   react/jsx-no-bind: ['warn']
   react/jsx-indent-props: ['warn']
@@ -52,7 +53,8 @@ rules:
   react/self-closing-comp: ['warn']
   react/jsx-indent: ['warn']
   react/no-array-index-key: ['warn']
-  jsx-a11y/anchor-is-valid: 
+  react/prefer-stateless-function: ['warn']
+  jsx-a11y/anchor-is-valid:
     - warn
     - components: ['Link']
       specialLink: ['To']
@@ -67,6 +69,7 @@ rules:
   # existing code. Some of them should be re-activated in the future.
   no-console: off
   no-shadow: off
+  nonblock-statement-body-position: off
   object-curly-spacing: off
   object-curly-newline: off
   object-property-newline: off

.sass-lint.yml

@@ -68,7 +68,7 @@ rules:
   hex-length: 1
   hex-notation: 1
   indentation: 1
-  leading-zero: 1
+  leading-zero: 0
   max-line-length: 0
   max-file-line-count: 0
   nesting-depth: 1

app/assets/assets/help/en/contributionGuidelines.md

@@ -1,41 +1,41 @@
-## Comments 
+## Comments
 
-CaptainFact is no ordinary social platform. Its vocation is to 
-focus on facts, evidence, sources, arguments and context 
+CaptainFact is no ordinary social platform. Its vocation is to
+focus on facts, evidence, sources, arguments and context
 but not to opinions.
-The comment section can be used to open the context but must not 
+The comment section can be used to open the context but must not
 deviate from the initial subject. Off-topic is sanctioned by the community.
 
-The `Approve` and `Refute` buttons should only be used when evidence 
-allow for **significantly** tilting the verification to one side or the other. 
-A minor error on a date or a slightly coarse rounding on a number do not 
-necessarily deserve to be invalidated: one can **confirm** 
-the statement as soon as the order of magnitude is good or post in commentary 
+The `Approve` and `Refute` buttons should only be used when evidence
+allow for **significantly** tilting the verification to one side or the other.
+A minor error on a date or a slightly coarse rounding on a number do not
+necessarily deserve to be invalidated: one can **confirm**
+the statement as soon as the order of magnitude is good or post in commentary
 if faced with an acceptable approximation.
 
 ## Statements
 
-To have its place on CaptainFact, a quote **must** fill out at least one 
+To have its place on CaptainFact, a quote **must** fill **out at least one** of
 the following criteria:
 
 * Be verifiable
 * Mention a source or a content on which a comment could make the link
 * Present incomplete or approximate elements
 * Making a false, misleading or deceptive argument
 
-It is also recommended to ask the following questions before adding 
+It is also recommended to ask the following questions before adding
 a quotation:
 
-* Could a typical person, upon hearing the statement, ask himself 
-  if it's true? For example, the statement "The sky is blue" is verifiable 
+* Could a typical person, upon hearing the statement, ask himself
+  if it's true? For example, the statement "The sky is blue" is verifiable
   but doesn't really need to be sourced.
 * Is the statement likely to be repeated and shared?
 * Is this a minor error or an acceptable hyperbole - often used in politics?
 
 #### About opinions in statements
 
-Opinions should as far as possible avoid appearing in quotations. 
-You can, if it does not deprive it of its meaning, replace the judgments of 
+Opinions should as far as possible avoid appearing in quotations.
+You can, if it does not deprive it of its meaning, replace the judgments of
 value (best, worst, stupid...etc) by `[...]`.
 
 For example :
@@ -44,4 +44,4 @@ For example :
 
 Can become:
 
-> This social measure \[...] has created an increase in unemployment
+> This social measure \[...] has created an increase in unemployment

app/assets/assets/help/en/privileges.md

@@ -20,13 +20,13 @@ Judgement actions such as voting and flagging are limited to avoid abusing them
 | 15         | Update speaker
 | 15         | Flag inappropriate content  
 | 30         | Add / create speakers
+| 75         | Add videos
 | 75         | Remove / restore statement
 | 75         | Shift all video's statements    
 | 75         | Remove speaker                             
 | 125        | No more new user restrictions
 | 125        | Access to the moderation platform
 | 125        | Restore speaker
-| 200        | Add videos (weekly limitation)
 | 200        | Self-vote                          
 
 # New user restrictions

app/assets/assets/help/fr/contributionGuidelines.md

@@ -15,7 +15,7 @@ si l'on est confrontés à une approximation acceptable.
 
 ## Citations
 
-Pour avoir sa place sur CaptainFact, une citation **doit** remplir au moins un 
+Pour avoir sa place sur CaptainFact, une citation **doit** remplir **au moins** un 
 des critères suivants :
 
 * Être vérifiable

app/assets/assets/help/fr/privileges.md

@@ -20,13 +20,13 @@ renforcer leur signification.
 | 15         | Mettre à jour un intervenant     
 | 15         | Signaler un contenu inapproprié                                       
 | 30         | Ajouter ou créer des intervenants
+| 75         | Ajouter une vidéo
 | 75         | Supprimer / restaurer une citation
 | 75         | Déplacer toutes les citations d'une vidéo (time shift)
 | 75         | Supprimer un intervenant
 | 125        | Moins de restrictions spécifiques aux nouveaux utilisateurs
 | 125        | Accès aux outils de modération collective
 | 125        | Restaurer un intervenant
-| 200        | Ajouter une vidéo (limitation hebdomadaire)
 | 200        | Voter pour soi-même
 
 # Restrictions spécifiques aux nouveaux utilisateurs

app/assets/favicons/browserconfig.xml

@@ -2,8 +2,8 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
+            <square150x150logo src="/favicons/mstile-150x150.png"/>
+            <TileColor>#307a7a</TileColor>
         </tile>
     </msapplication>
 </browserconfig>

app/assets/favicons/site.webmanifest

@@ -0,0 +1,19 @@
+{
+    "name": "CaptainFact (Beta)",
+    "short_name": "CaptainFact",
+    "icons": [
+        {
+            "src": "/favicons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/favicons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}

app/components/App/Logo.jsx

@@ -1,10 +1,11 @@
 import React from 'react'
 
+const LOGO = '/assets/img/logo.svg'
+const BORDERLESS_LOGO = '/assets/img/logo-borderless.svg'
 
-const Logo = () => (
+const Logo = ({borderless = false}) => (
   <h1 className="site-logo title is-1">
-    <img width="47" src="/assets/img/logo.png" style={{zIndex: 2}}/>
-    <span className="alt-c">C</span>
+    <img alt="C" src={borderless ? BORDERLESS_LOGO : LOGO}/>
     <span className="logo-captain">aptain</span>
     <span className="logo-fact">Fact</span>
     <small className="beta"> (Beta)</small>

app/components/App/Sidebar.jsx

@@ -116,7 +116,9 @@ export default class Sidebar extends React.PureComponent {
           <div className="menu-collapse-button" onClick={() => this.props.toggleSidebar()}>
             <RawIcon name="bars"/>
           </div>
-          <Link to="/"><Logo/></Link>
+          <Link to="/">
+            <Logo borderless/>
+          </Link>
         </div>
 
         <div className="menu-content">