9273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	849795be9c	Merge pull request #2862 from strapi/improve/ctm ... Allow to create new entry for models that have only relational fields	2019-02-25 14:56:35 +01:00
Jim LAURIE	9c5850a734	Merge branch 'master' into improve/ctm	2019-02-25 14:56:27 +01:00
Jim LAURIE	b64bd446f1	Merge pull request #2864 from rejifald/bookshelf-template-typo-fix ... Added mising await statement in bookshelf template	2019-02-25 12:26:56 +01:00
Jim LAURIE	7bbf245af7	Merge branch 'master' into bookshelf-template-typo-fix	2019-02-25 12:26:49 +01:00
Jim LAURIE	c156b1e7e9	Merge pull request #2869 from strapi/fix/displayedAttribute ... Display ID as default displayed attribute	2019-02-25 12:11:24 +01:00
Jim LAURIE	4242d99c19	Merge branch 'master' into fix/displayedAttribute	2019-02-25 12:11:18 +01:00
Ky	7b53c1066c	keep videos infos on clear localStorage	2019-02-25 12:02:59 +01:00
Ky	4300ba3595	merge	2019-02-22 15:29:25 +01:00
Ky	498f3912f1	keep videos infos in localStorage after clear it	2019-02-22 15:27:43 +01:00
Ky	e8f7616c56	keep videos infos in localStorage after clear it	2019-02-22 15:27:19 +01:00
Aurélien Georget	4875649bc7	Fix CORS issue	2019-02-22 15:25:11 +01:00
Jim LAURIE	4b2f261604	Merge pull request #2873 from strapi/harmonize/front-end-paths ... Remove relative imports in all the plugins	2019-02-22 14:05:28 +01:00
Ky	73928e1af5	merge without conflict	2019-02-22 12:48:01 +01:00
Aurélien Georget	ceac222cb6	Fix typo	2019-02-22 12:40:29 +01:00
Ky	5541bc3d77	UI fixes	2019-02-22 12:20:47 +01:00
Ky	1f5732e741	UI fixes	2019-02-22 12:20:16 +01:00
soupette	28bc9f23a8	Change paths in users-permissions	2019-02-22 11:16:42 +01:00
soupette	8907261260	Change paths in doc and settings email	2019-02-22 11:11:25 +01:00
soupette	31b317163d	Change paths in ctb	2019-02-22 10:56:38 +01:00
Aurélien Georget	6f61987ad7	Fix conflicts	2019-02-22 10:54:39 +01:00
Aurélien Georget	a80a3bd593	Disable CORS for fetching the videos & remove warnings logs	2019-02-22 10:53:52 +01:00
soupette	d84ed0ec93	Change path in ctm compos	2019-02-22 10:46:42 +01:00
soupette	7437e2d52e	Change path in ctm containers	2019-02-22 10:34:59 +01:00
soupette	ab158dddd6	Change to absolute path strapi-helper	2019-02-22 10:22:21 +01:00
Ky	e01dc0eee3	Some UI fixes	2019-02-22 10:09:07 +01:00
soupette	0ce1456d94	Change to absolute path strapi-admin components	2019-02-22 10:08:59 +01:00
soupette	ae7f447746	Add aboslute path in strapi-admin/containers	2019-02-22 10:05:07 +01:00
Aurélien Georget	4f322de0fd	Add events on the users & permissions settings part	2019-02-21 16:48:59 +01:00
Aurélien Georget	bccf12e3b1	Fix conflicts	2019-02-21 15:45:20 +01:00
Aurélien Georget	fc5b2ee025	Add events on configure layout/edit fields links	2019-02-21 15:43:30 +01:00
Jim LAURIE	8ade1c223e	Merge pull request #2868 from Jefwillems/patch-2 ... Fix typo in admin generation cli.	2019-02-21 15:40:17 +01:00
Jim LAURIE	ae38251dc2	Fix empty space	2019-02-21 14:29:08 +01:00
Aurélien Georget	f57161df74	Display ID as default displayed attribute	2019-02-21 13:59:10 +01:00
Jef Willems	7f1f288b31	Fix typo	2019-02-21 11:58:34 +01:00
Aurélien Georget	6cb88302ca	Add events content manager	2019-02-20 18:23:25 +01:00
Ky	9e1620cab9	Onboarding videos with manual events and Amplitude tracking with timestamp	2019-02-20 16:13:46 +01:00
Oleksandr Zhuravlov	f0f4b13b8f	added mising await statement in bookshelf template	2019-02-20 16:47:41 +02:00
Aurélien Georget	cd4313236c	Add events in the content-type builder	2019-02-20 15:31:07 +01:00
Sinelle Richard	8b0f504ebc	Merge branch 'master' into master	2019-02-20 14:51:47 +01:00
soupette	b847cee7ac	Fix redirect link	2019-02-20 14:39:14 +01:00
soupette	4cb3469bd3	Allow to create new entry for models that have only relational fields	2019-02-20 14:25:49 +01:00
REDDY PRASAD	7c77cb985f	✨ Add granularity of 'max size upload' for file upload	2019-02-20 11:12:23 +05:30
Bobbylee Ingalls	168769c5d1	Updated minor grammar defect	2019-02-19 08:58:36 -06:00
Jim LAURIE	c50a586418	Merge pull request #2852 from strapi/3.0.0-alpha.24.1 ... 3.0.0 alpha.24.1	2019-02-19 11:31:11 +01:00
Jim LAURIE	14e3b8fdbb	3.0.0-alpha.24.1 v3.0.0-alpha.24.1	2019-02-19 11:29:51 +01:00
Jim LAURIE	08f5340c42	Update migration guide	2019-02-19 11:29:16 +01:00
Jim LAURIE	ec1c46ba6a	Merge pull request #2851 from strapi/hotfix-ctm-pluginid ... Fix plugin id content manager build	2019-02-19 11:25:22 +01:00
Jim LAURIE	5d95dfec3d	fix plugin id	2019-02-19 11:19:32 +01:00
Sinelle Richard	d87616e716	2827: Return bad request in case of empty files attribut	2019-02-19 10:29:26 +01:00
Jim LAURIE	9a144b5dab	Merge pull request #2849 from strapi/3.0.0-alpha.24 ... 3.0.0 alpha.24	2019-02-19 10:18:38 +01:00