1325 Commits

Author	SHA1	Message	Date
Alexandre Bodin	9f0713649b	v3.0.0-beta.17.1	2019-10-16 11:42:54 +02:00
Alexandre Bodin	7c8eda443e	v3.0.0-beta.17	2019-10-16 10:40:18 +02:00
cyril lopez	d1e1c404e3	Merge branch 'develop' into update/plugin-generators	2019-10-15 07:42:04 +02:00
soupette	6ea77b69e5	Merge branch 'master' of github.com:strapi/strapi into develop	2019-10-15 07:40:55 +02:00
Jelmer Visser	16bd271eee	Fix for #3974 URIError appeared after entering % symbol into the Search input field (#4236)	2019-10-14 10:50:26 +02:00
soupette	20e7e9fcc3	Fix padding	2019-10-14 08:32:37 +02:00
Virginie Ky	c53f3672b1	merge	2019-10-11 15:16:51 +02:00
Virginie Ky	5b32e32758	Some UI fixes	2019-10-11 14:59:41 +02:00
Virginie Ky	8040e89d7f	clean css and buttons ui	2019-10-10 16:21:32 +02:00
soupette	a27c8b2887	Merge branch 'develop' of github.com:strapi/strapi into front/remove-sass	2019-10-10 06:34:54 +02:00
soupette	beef6e5510	Fix conflicts	2019-10-10 06:34:31 +02:00
soupette	8bd092eff7	Remove all scss files in helper plugin	2019-10-09 18:06:51 +02:00
soupette	77c94645e8	Remove scss files	2019-10-09 15:44:56 +02:00
soupette	62acc713c1	Init styled-compo migration in helper plugin	2019-10-09 12:31:36 +02:00
Virginie Ky	edc61d3522	Fix conflicts	2019-10-08 12:27:04 +02:00
Virginie Ky	0c23fe8bae	Content manager UI	2019-10-08 11:51:10 +02:00
Virginie Ky	6cae06b63c	Users permissions edit page responsive ip	2019-10-08 09:50:15 +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	d4bc0c1683	Users permissions edit view policies fix	2019-10-07 13:42:39 +02:00
Alexandre BODIN	1a49d1a51e	Merge pull request #3691 from DKvistgaard/bugfix/cloudinary-delete-resource-type ... Fix Cloudinary deletion of other files than images	2019-10-04 14:44:09 +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
Daniel Kvistgaard	66cdd9d068	Merge branch 'master' into bugfix/cloudinary-delete-resource-type	2019-10-02 09:34:20 +02:00
Alexandre Bodin	dbd621e6d8	v3.0.0-beta.16.7	2019-10-01 12:15:48 +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
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
jasongitmail	d5e8b8dc50	Merge branch 'master' into step-any-fix	2019-09-18 18:27:56 +00: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
soupette	6e425923ba	Fix PR feedback	2019-09-17 16:04:38 +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
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
jasongitmail	2f2ecb587c	Merge branch 'master' into step-any-fix	2019-09-16 18:32:51 +00:00
jasongitmail	603d3ed757	Change to step={props.step}	2019-09-16 18:30:35 +00:00
soupette	6494a3dd07	Merge branch 'master' of github.com:strapi/strapi into front/context-api	2019-09-16 13:52:59 +02:00
soupette	b4bf897016	Update ctb tests so it uses the new context api	2019-09-16 11:57:18 +02:00
Alexandre BODIN	c66eb5d2cf	Merge branch 'master' into chore/routing-x-forwarded	2019-09-13 17:40:50 +02:00
virginieky	5fc8600506	Merge branch 'master' into features/media-preview	2019-09-13 16:16:36 +02:00
soupette	823cd24771	Created GlobalContext and update remove the old context api in strapi-admin	2019-09-13 15:28:10 +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	b11e9375c9	Merge branch 'master' into features/media-preview	2019-09-13 10:19:55 +02:00
jasongitmail	eb8be740a2	Merge branch 'master' into step-any-fix	2019-09-13 01:06:43 +00:00