10 Commits

Author SHA1 Message Date
Aurelsicoko
51d936b559 Resolve conflicts 2017-09-25 18:28:45 +02:00
Aurelsicoko
b8accc03b9 Use React and React-DOM through global to use the exact same dependency everywhere 2017-09-22 16:56:09 +02:00
cyril lopez
7c6a3f4687 Fix conflict 2017-09-14 15:10:08 +02:00
Pierre Burgy
ddcfd8fb1f Update eslint dependencies 2017-08-18 17:02:33 +02:00
cyril lopez
7532670f93 Created empty view for homepage 2017-08-16 18:47:02 +02:00
Pierre Burgy
3acbc88747 Merge branch 'plugin/content-manager' of https://github.com/strapi/strapi into plugin/settings-manager 2017-07-24 21:17:56 +02:00
cyril lopez
2ef94154be added change default language and update eslint to support setstate in component did mount 2017-07-24 17:28:10 +02:00
Pierre Burgy
e860a1d172 Fix plugins setup 2017-07-21 17:18:47 +02:00
Pierre Burgy
897f2d825b Use ESLint config in strapi-helper-plugin 2017-06-06 14:22:17 +02:00
Pierre Burgy
f627d5642d Move eslint config 2017-05-17 11:37:00 +02:00