Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions

packages/strapi-admin/admin/src/app.js

@@ -43,7 +43,9 @@ import { translationMessages, languages } from './i18n';
 import { findIndex } from 'lodash';
 /* eslint-enable */
 
+// Retrieve plugins from config.
 let appPlugins = plugins;
+
 // Create redux store with history
 const initialState = {};
 const history = createHistory({
@@ -93,7 +95,8 @@ if (window.location.port !== '4000') {
       return response.json();
     })
     .then(plugins => {
-      appPlugins = plugins;
+      appPlugins = plugins || [];
+
       (plugins || []).forEach(plugin => {
         const script = document.createElement('script');
         script.type = 'text/javascript';

packages/strapi-admin/admin/src/containers/AdminPage/index.js

@@ -66,7 +66,7 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
       this.props.history.push(`/plugins/users-permissions/auth/${endPoint}`);
     }
 
-    if (!this.isUrlProtected(props) && includes(props.location.pathname, 'register') && this.hasAdminUser()) {
+    if (!this.isUrlProtected(props) && includes(props.location.pathname, 'register') && this.hasAdminUser(props)) {
       this.props.history.push('/plugins/users-permissions/auth/login');
     }
 

packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/index.js

@@ -14,7 +14,7 @@ import { findIndex, get, isBoolean, isEmpty, map, replace } from 'lodash';
 import cn from 'classnames';
 
 // Logo
-import LogoStrapi from 'assets/images/logo_strapi.png';
+import LogoStrapi from 'assets/images/logo.svg';
 
 // Design
 import Button from 'components/Button';

packages/strapi-plugin-users-permissions/admin/src/containers/AuthPage/styles.scss

@@ -81,9 +81,9 @@
 
 .logoContainer {
   position: absolute;
-  bottom: 20px;
-  left: 10px;
+  left: 30px; bottom: 30px;
+
   > img {
-    height: 20px;
+    height: 34px;
   }
 }

packages/strapi-plugin-users-permissions/config/roles.json

@@ -521,4 +521,4 @@
       }
     }
   }
-}
+}