995 Commits

Author	SHA1	Message	Date
Robin Venneman	6bfe1e84ed	fix: don't show unique attribute for rich text fields #5305 ... Signed-off-by: Robin Venneman <robin.venneman@gmail.com>	2020-03-02 22:14:49 +01:00
Jim LAURIE	638ddd201e	Merge branch 'master' into update-zh-hans-translations	2020-02-07 09:56:09 +01:00
cyril lopez	8745d2373a	Merge branch 'master' into feat/update-pl-translations	2020-02-06 14:39:05 +01:00
ruibaby	ff489ce051	feat: updated zh-Hans translations. ... Signed-off-by: ruibaby <i@ryanc.cc>	2020-02-04 15:55:02 +08:00
Mariusz Wachowski	4e5326490e	feat: updated pl translations ... Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>	2020-01-22 21:54:08 +01:00
soupette	a9c9549458	Fixes #5038 ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-22 12:14:17 +01:00
soupette	be64adaa1c	Fix conflicts ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-22 10:29:36 +01:00
soupette	489c7b2324	Fix lint ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-21 18:34:27 +01:00
cyril lopez	a6ac47afd9	Merge branch 'master' into chore/ctb-front-end-tests	2020-01-21 17:24:27 +01:00
soupette	c2f238fabc	Add new line before if rule ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-21 16:44:57 +01:00
soupette	eb00b7e0ea	Add newline-before-return rule ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-21 16:31:05 +01:00
soupette	2a4351794b	Fix lint webhooks ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-21 16:25:14 +01:00
soupette	b3ba8c27ef	Fix conflicts ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-21 16:12:46 +01:00
soupette	f50f89f0a8	Update eslint configuration ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-21 16:03:31 +01:00
soupette	6ea595110b	Apply PR feedback ... Signed-off-by: soupette <cyril.lpz@gmail.com>	2020-01-16 16:08:39 +01:00
Virginie Ky	4add71d56b	CTB sublist button UI fix	2020-01-16 15:26:30 +01:00
soupette	da4c9d5330	Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests	2020-01-15 14:50:43 +01:00
soupette	451e1e6de8	Add tests for FormModal reducer	2020-01-15 14:47:54 +01:00
soupette	16a6975af1	Fix add compo to dz action	2020-01-15 12:35:26 +01:00
soupette	e13e8e242b	Add tests for internal relations	2020-01-15 12:01:05 +01:00
soupette	7c7813a787	Init relations tests	2020-01-14 17:14:46 +01:00
soupette	1f85288c63	Add tests for removing a field from a content type	2020-01-14 16:01:27 +01:00
soupette	3db763340c	Add tests for all relations	2020-01-14 15:30:14 +01:00
soupette	1e3c3d9736	Add test for adding a relation with another ct	2020-01-14 15:01:43 +01:00
soupette	c577097994	Add test for adding a compo and a dz	2020-01-14 12:31:39 +01:00
soupette	0a2dffc1d4	Fix conflicts	2020-01-14 09:35:34 +01:00
soupette	bfe37c73c9	Fix conflicts	2020-01-13 11:39:08 +01:00
Virginie Ky	fb7017c3ea	Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview	2020-01-13 10:19:14 +01:00
Alexandre Bodin	dcc29b361b	Merge branch 'develop' into features/webhooks	2020-01-13 09:41:20 +01:00
virginieky	50643f94b3	Merge branch 'master' into chore/eslint-config	2020-01-10 17:44:43 +01:00
Virginie Ky	4aeb5399ee	Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview	2020-01-09 11:11:32 +01:00
Alexandre Bodin	f28292b384	Merge branch 'develop' into features/webhooks	2020-01-09 11:09:26 +01:00
Virginie Ky	d0650f1884	Conflicts resolved	2020-01-09 11:05:46 +01:00
soupette	60cd11624a	Add test for adding a common attribute	2020-01-08 17:57:25 +01:00
soupette	c259377bd2	Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests	2020-01-08 17:20:06 +01:00
soupette	af2c2a1841	Fix edit date types	2020-01-08 17:09:04 +01:00
soupette	253fcff5da	Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests	2020-01-08 16:42:17 +01:00
soupette	8a570964c6	Add tests for simple actions	2020-01-08 16:42:01 +01:00
Jim LAURIE	2b2295ee78	Merge branch 'master' into feature/adminTranslationCs	2020-01-08 15:34:16 +01:00
soupette	9526b0510b	Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests	2020-01-08 13:25:42 +01:00
soupette	aa9d4e2d7a	Add basics tests for reducer	2020-01-08 13:25:11 +01:00
soupette	c62dad2140	Improve eslint config fron front-end files	2020-01-08 12:21:47 +01:00
soupette	73214e7237	Add eslint rule	2020-01-08 12:02:22 +01:00
soupette	d9a81c7011	Fix naming	2020-01-08 11:38:23 +01:00
Jaroslav Vrána	0215f64648	Merge branch 'master' into feature/adminTranslationCs	2020-01-07 19:32:32 +01:00
Jaroslav Vrána	91b0f5a990	Merge pull request #2 from profispojka/feature/adminTranslationCsWithPlugins ... Feature/admin translation cs with plugins	2020-01-07 19:27:17 +01:00
soupette	d1312e6894	Merge branch 'master' of github.com:strapi/strapi into ctb/improve-stepper	2020-01-07 18:06:17 +01:00
soupette	15f3a83f34	Fix PR feedback	2020-01-07 18:05:29 +01:00
soupette	8c7e0f297a	Add basics reducer tests	2020-01-07 17:51:34 +01:00
soupette	7a24e53192	Improve makeUnique utils	2020-01-07 16:05:46 +01:00