1983 Commits

Author	SHA1	Message	Date
soupette	75abb17f0f	Fix conflicts	2019-10-08 09:17:47 +02:00
Virginie Ky	42257b3af4	Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb	2019-10-07 13:54:31 +02:00
Virginie Ky	cde0369024	content manager displayed fields dropdown ui	2019-10-04 15:41:23 +02:00
Virginie Ky	53efb1269b	content manager filters ui	2019-10-04 15:23:50 +02:00
Alexandre Bodin	2d04d25097	v3.0.0-beta.16.8	2019-10-04 11:57:46 +02:00
cyril lopez	39988b3efb	Merge branch 'master' into develop	2019-10-03 10:47:25 +02:00
soupette	2dc5df9595	Fix #4127	2019-10-01 16:25:08 +02:00
Alexandre Bodin	dbd621e6d8	v3.0.0-beta.16.7	2019-10-01 12:15:48 +02:00
soupette	6f8b23d254	Fix conflicts	2019-09-27 16:26:09 +02:00
cyril lopez	3a4bb7fda5	Merge branch 'develop' into front/context-api	2019-09-27 15:44:15 +02:00
Alexandre Bodin	6305bee43b	v3.0.0-beta.16.6	2019-09-26 14:35:06 +02:00
Virginie Ky	11f3871af1	Bootstrap and fonts without sass	2019-09-24 18:42:08 +02:00
Alexandre BODIN	b3648ba4d9	Merge branch 'master' into chore/routing-x-forwarded	2019-09-24 10:04:19 +02:00
Alexandre BODIN	e6e1a70c2b	Merge branch 'master' into fix/media-preview	2019-09-23 09:44:45 +02:00
cyril lopez	83a6fe44e4	Merge branch 'master' into front/context-api	2019-09-23 09:38:26 +02:00
Virginie Ky	230ba6b41f	merge master	2019-09-19 17:09:29 +02:00
Virginie Ky	92f71d777d	reviews feedback	2019-09-19 10:17:20 +02:00
HuyNQ	712848b378	Fix filterOption of SelectMany to enable searching in multiple select	2019-09-19 11:02:47 +07:00
Virginie Ky	1a82ba625e	constant naming	2019-09-18 18:56:04 +02:00
Virginie Ky	dfe3922ca7	add const	2019-09-18 18:25:50 +02:00
Virginie Ky	0c6508af52	count fix	2019-09-18 18:11:31 +02:00
Alexandre Bodin	bf7870de3b	Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded	2019-09-18 17:29:09 +02:00
Alexandre Bodin	84adbf3bcf	v3.0.0-beta.16.5	2019-09-18 14:00:21 +02:00
Alexandre BODIN	7a94d9dad9	Merge branch 'master' into chore/routing-x-forwarded	2019-09-18 13:27:39 +02:00
cyril lopez	6c8a446e0c	Merge branch 'master' into front/context-api	2019-09-17 13:36:59 +02:00
Alexandre Bodin	df236d0642	v3.0.0-beta.16.4	2019-09-17 12:14:39 +02:00
Alexandre BODIN	f8bfb636cd	Merge branch 'master' into fix/group-navigation	2019-09-17 10:46:13 +02:00
Alexandre BODIN	67ed10a56f	Merge branch 'master' into fix/#4026	2019-09-17 10:42:24 +02:00
soupette	8ad1256fab	Fixes #4026	2019-09-17 10:22:20 +02:00
cyril lopez	8657453ea2	Merge branch 'master' into eslint-update	2019-09-17 10:11:11 +02:00
Alexandre BODIN	8a6c162095	Merge branch 'master' into chore/routing-x-forwarded	2019-09-16 23:07:54 +02:00
soupette	d2c8d5e419	Fixes #4013	2019-09-16 17:47:43 +02:00
soupette	6494a3dd07	Merge branch 'master' of github.com:strapi/strapi into front/context-api	2019-09-16 13:52:59 +02:00
Alexandre BODIN	c66eb5d2cf	Merge branch 'master' into chore/routing-x-forwarded	2019-09-13 17:40:50 +02:00
soupette	c971ab5ada	Remove all context api in all plugins except users	2019-09-13 17:05:21 +02:00
virginieky	5fc8600506	Merge branch 'master' into features/media-preview	2019-09-13 16:16:36 +02:00
Virginie Ky	1b53286c71	merge	2019-09-13 16:05:10 +02:00
Virginie Ky	4f9065f19e	last review apply	2019-09-13 16:04:15 +02:00
Alexandre Bodin	36e4e73ad3	v3.0.0-beta.16.3	2019-09-13 15:08:44 +02:00
soupette	9ad9fafd6b	Fixes #3987 #3954	2019-09-13 14:46:31 +02:00
Alexandre BODIN	09a227c3d8	Merge branch 'master' into fix/json-array-pg	2019-09-13 10:56:28 +02:00
Alexandre Bodin	852be46911	Stringify json input for pg to support arrays	2019-09-13 10:41:21 +02:00
Alexandre Bodin	ae6492dab2	Allow group mainField and defaultSortBy to be id	2019-09-13 10:36:48 +02:00
Alexandre BODIN	b11e9375c9	Merge branch 'master' into features/media-preview	2019-09-13 10:19:55 +02:00
Abdón Rodríguez Davila	54c383fd44	Merge branch 'master' into eslint-update	2019-09-12 15:05:53 +02:00
Alexandre Bodin	e20d781383	Merge branch 'master' into chore/routing-x-forwarded	2019-09-12 09:59:11 +02:00
Alexandre Bodin	7207184648	v3.0.0-beta.16.2	2019-09-11 19:22:05 +02:00
Virginie Ky	c21f9272f6	media border	2019-09-11 10:36:27 +02:00
Virginie Ky	395f82a128	PR feedbacks	2019-09-11 10:07:25 +02:00
soupette	a8dae57806	Merge branch 'master' of github.com:strapi/strapi into front/auth-views	2019-09-10 17:52:20 +02:00