944 Commits

Author	SHA1	Message	Date
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00
cyril lopez	f152e0cac8	Add ctm in plugins container and add its icon in pluginsPage. ... Change LeftMenu to functionnal component	2018-06-28 12:49:26 +02:00
cyril lopez	2bd990794e	Fix content-manager with new data type	2018-06-28 12:27:15 +02:00
cyril lopez	b396b29624	Fix ListView with new data	2018-06-28 12:12:54 +02:00
cyril lopez	799c6c3f0f	Remove webpack warnings and react-intl errors	2018-06-28 10:01:59 +02:00
cyril lopez	f09cace582	Remove JSON & Wysiwyg from helper-plugin and move them to content-manager	2018-06-28 09:46:10 +02:00
Jim LAURIE	c5f1b8507e	Merge branch 'master' into language-pt	2018-06-27 14:51:17 +02:00
Broc Gailit	9226147e7c	Merge branch 'master' into master	2018-06-26 08:20:07 -07:00
Jim LAURIE	a686949d55	Merge branch 'master' into patch-sql-timezone	2018-06-26 13:28:53 +02:00
Faustino Kialungila	c8a74b9e69	Portuguese Language Support	2018-06-23 12:11:20 +02:00
Broc Gailit	81ccc526bc	Merge branch 'master' into master	2018-06-21 18:44:40 -07:00
Johann Pinson	d9f5af24d5	fix(admin): change timezone manager from admin when db is sql	2018-06-20 16:49:21 +02:00
Broc Gailit	da319dcb25	Merge branch 'master' into master	2018-06-20 07:31:34 -07:00
cyril lopez	6f156144b5	Merge branch 'master' into add-loader	2018-06-20 15:15:34 +02:00
Jim LAURIE	c93fef17dc	Merge branch 'master' into input-json	2018-06-20 12:28:59 +02:00
Jim LAURIE	9be5655d00	Fix PR feedback	2018-06-20 12:19:58 +02:00
Jim LAURIE	2761f3949f	Merge branch 'master' into master	2018-06-20 09:33:30 +02:00
Alessio Koci	c8f9b2f07c	fix directories structure	2018-06-20 09:31:25 +02:00
Broc Gailit	bc2f3256c5	Merge branch 'master' into master	2018-06-19 09:02:35 -07:00
Broc Gailit	0f556b5aca	Use empty array as default value in handleChange ... Fixes TypeError (null conversion)	2018-06-19 08:47:28 -07:00
Alessio Koci	fe2154e1d0	Language IT - Strapi Content Manager	2018-06-19 14:35:20 +02:00
Broc Gailit	609dd1b394	Implement sorting for SelectMany in Frontend	2018-06-18 09:41:31 -07:00
Özgür ERSOY	d6b6beb3c4	fix missing translations	2018-06-18 13:46:05 +03:00
soupette	da865168e8	Fix css	2018-06-18 12:27:57 +02:00
soupette	372842ef5c	Merge branch 'master' of github.com:strapi/strapi into add-loader	2018-06-18 11:11:38 +02:00
soupette	e4ed3b4d11	Merge master	2018-06-18 10:16:32 +02:00
Salem	28be24bc75	Rename sa.json to ar.json	2018-06-17 16:06:00 +03:00
Salem	fb43b7c052	Rename ar.json to sa.json	2018-06-17 16:02:54 +03:00
Jim LAURIE	e8d435989c	Merge branch 'master' into master	2018-06-17 14:16:33 +02:00
soupette	7ffb90621a	Handle JSON errors	2018-06-15 16:48:29 +02:00
Dominik Opyd	734ecc1cfc	polish language | strapi-plugin-content-manager	2018-06-14 18:58:05 +02:00
Dominik Opyd	7186cd6e49	polish language | upgrade	2018-06-14 15:59:24 +02:00
soupette	4268f788c9	Add loading view to editpage	2018-06-13 17:36:02 +02:00
soupette	915d419a59	Fix conflicts	2018-06-13 16:34:28 +02:00
soupette	5cae072b19	Add loaders to ctm listpage	2018-06-13 16:17:19 +02:00
Jim Laurie	3a8173171e	Clean some lint	2018-06-13 11:54:21 +02:00
Jim LAURIE	dbe235de3b	Merge branch 'master' into ctm-search	2018-06-13 10:34:12 +02:00
soupette	4a1d9bea1c	Change params q to _q	2018-06-12 11:43:41 +02:00
Jim LAURIE	5a77a67338	Merge branch 'master' into bulk-actions	2018-06-12 11:32:01 +02:00
Aurelsicoko	ddc1258429	Merge branch 'ctm-search' of github.com:strapi/strapi into ctm-search	2018-06-11 17:58:56 +02:00
Aurelsicoko	3dd2615c98	Remove unnecessary padding on List container	2018-06-11 17:56:39 +02:00
Aurelsicoko	be87950148	Add new icon and update CSS to follow the original design	2018-06-11 17:52:40 +02:00
soupette	47d6e2c743	Add minus to bulk actions	2018-06-11 17:04:20 +02:00
soupette	e6fafed2c2	Remove unappropriate filters	2018-06-08 12:19:04 +02:00
soupette	7545afd28a	Fix PR feedback	2018-06-07 19:13:17 +02:00
soupette	d716888296	Search with mongoose	2018-06-07 18:50:43 +02:00
soupette	a90f60ddd0	Improve TableDelete and fix search request	2018-06-07 15:08:11 +02:00
soupette	f47ac188cb	Reset search when adding filters	2018-06-07 14:26:00 +02:00
soupette	07d007ebb4	Front-end search logic	2018-06-07 10:38:30 +02:00
soupette	fc5434037f	Init search component	2018-06-06 18:51:24 +02:00