Fix conflict

ROADMAP.md

@@ -67,12 +67,36 @@ _Reorganize the mono-repository. The rule to follow is to only have hooks withou
 - ~~Use Pino as logger~~.
 
 `strapi@alpha.6` *(expected release date: 21/09/2017)*:
-- [Plugin] Content Manager.
-- [Plugin] Content Type Builder.
-- Finalize the plugins queries process to be able to use different ORMs.
-- Update `strapi-helper-plugin` and `strapi-admin` dependencies to the latest version.
-- Use [lerna](http://lernajs.io) to run tests.
+- ~~[Admin] Reduce number of steps to be able to contribute~~.
+- ~~[Admin] Reduce bundle size by sharing commons dependencies~~.
+- ~~[Admin] Update `strapi-helper-plugin` and `strapi-admin` dependencies to the latest version~~.
+- ~~[Plugin] Content Manager~~.
+- ~~[Plugin] Content Type Builder~~.
+- ~~[Plugin] Finalize the query process to be able to use different ORMs~~.
+- ~~[Plugin] Execute `bootstrap` function before mounting~~.
+- ~~[Plugin] Execute `requirement` function to allow or not rendering~~.
+- ~~[Framework] Support filters parameters~~.
+- ~~Write new documentation~~.
 
-`strapi@alpha.7` *(expected release date: 31/10/2017)*:
+`strapi@alpha.7` *(expected release date: 24/11/2017)*:
+- [Admin] Define push area into the plugins.
+- [Admin] Harmonise sharing components between plugins.
+- [Admin] `List plugins` page.
+- [Admin] Use latest available version of Bootstrap.
 - [Plugin] Users & groups (with full authentication process).
-- Give the ability to create a log file.
+- Improve generated APIs (especially the relation part).
+
+`strapi@alpha.8` *(expected release date: 22/12/2017)*:
+- [Plugin] Upload.
+- [Plugin] Email.
+- [Plugin] GraphQL.
+- [Plugin] Content Manager v2
+  - Search (filters).
+  - WYSWYG.
+  - Required relation.
+- Re-design & improve the DX of the validations layer.
+
+`strapi@alpha.9` *(expected release date: 19/01/2018)*:
+- [Plugin] Be able to reinstall a plugin without loosing the user's configurations.
+- [Plugin] Settings Manager v2 (add/update configurations in each every environment).
+- HTTP/2.

packages/strapi-admin/package.json

@@ -47,7 +47,7 @@
     "prettier": "^1.7.4",
     "rimraf": "^2.6.2",
     "strapi-helper-plugin": "3.0.0-alpha.5.5",
-    "webpack": "^3.6.0"
+    "webpack": "^3.7.1"
   },
   "author": {
     "name": "Strapi",

packages/strapi-helper-plugin/.gitignore

@@ -1,4 +1,5 @@
 # Don't check auto-generated stuff into git
+dist
 coverage
 build
 node_modules

packages/strapi-helper-plugin/lib/internals/webpack/dist/vendor.dll.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"vendor.dll.js","sources":["webpack:///vendor.dll.js"],"mappings":"AAAA;;;;;AAwPA;;;;;;;;;;;;;;AAslIA","sourceRoot":""}

packages/strapi-plugin-content-manager/admin/src/components/Table/styles.scss

@@ -3,6 +3,7 @@
   border-collapse: initial;
   overflow: hidden;
   box-shadow: 0 2px 4px #E3E9F3;
+  table-layout: fixed;
 
   tr, th, td{
     border: none;

packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js

@@ -58,10 +58,14 @@ class TableRow extends React.Component {
     // Generate cells
     const cells = this.props.headers.map((header, i) => (
       <td key={i}>
-        {this.getDisplayedValue(
-          header.type,
-          this.props.record[header.name]
-        )}
+        <div className={styles.truncate}>
+          <div className={styles.truncated}>
+            {this.getDisplayedValue(
+              header.type,
+              this.props.record[header.name]
+            )}
+          </div>
+        </div>
       </td>
     ));
 

packages/strapi-plugin-content-manager/admin/src/components/TableRow/styles.scss

@@ -18,6 +18,18 @@
   }
 }
 
+.truncate {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+}
+
+.truncated {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .actions {
   text-align: right;
 

packages/strapi-plugin-content-manager/package.json

@@ -63,6 +63,6 @@
     "prettier": "^1.7.4",
     "rimraf": "^2.6.2",
     "strapi-helper-plugin": "3.0.0-alpha.5.5",
-    "webpack": "^3.6.0"
+    "webpack": "^3.7.1"
   }
 }

packages/strapi-plugin-content-type-builder/package.json

@@ -51,7 +51,7 @@
     "prettier": "^1.7.4",
     "rimraf": "^2.6.2",
     "strapi-helper-plugin": "3.0.0-alpha.5.5",
-    "webpack": "^3.6.0"
+    "webpack": "^3.7.1"
   },
   "author": {
     "name": "Strapi team",

packages/strapi-plugin-settings-manager/package.json

@@ -48,7 +48,7 @@
     "prettier": "^1.7.4",
     "rimraf": "^2.6.2",
     "strapi-helper-plugin": "3.0.0-alpha.5.5",
-    "webpack": "^3.6.0"
+    "webpack": "^3.7.1"
   },
   "author": {
     "name": "Strapi team",