910 Commits

Author	SHA1	Message	Date
Ky	484622e85b	get videos sage algo optim for prod env	2019-02-26 10:28:47 +01:00
cyril lopez	95433180ca	Merge branch 'master' into onboarding-videos	2019-02-25 17:46:32 +01:00
virginieky	9a7bdb0247	Merge branch 'master' into onboarding-videos	2019-02-25 14:59:35 +01:00
Jim LAURIE	4242d99c19	Merge branch 'master' into fix/displayedAttribute	2019-02-25 12:11:18 +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
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
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
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	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
Aurélien Georget	f57161df74	Display ID as default displayed attribute	2019-02-21 13:59:10 +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
Aurélien Georget	cd4313236c	Add events in the content-type builder	2019-02-20 15:31:07 +01:00
virginieky	6ff17263e9	Merge branch 'master' into ctm-edit-links	2019-02-18 19:41:13 +01:00
Ky	19b6f3ce1e	Onboarding videos UI and storage - event emit in progress	2019-02-15 18:55:28 +01:00
Jim LAURIE	f7c5fb3dff	Merge branch 'master' into split-helper-package	2019-02-15 10:25:32 +01:00
Ky	a2bc9ab609	retrieve videos from API and update redux store and UI	2019-02-14 19:03:17 +01:00
Ky	fac9b60f00	hide links on prod and some requested changes	2019-02-14 12:10:38 +01:00
Ky	163ca8c317	Init video container	2019-02-14 10:36:20 +01:00
soupette	928971b1e3	Fix PR feedback and change stores name with <pluginId>_<containerName>	2019-02-14 09:48:39 +01:00
Ky	cbb53ac8d4	Content manager edit layout and fields links list	2019-02-12 10:50:41 +01:00
soupette	d81fba0488	Update tests with the single store	2019-02-11 18:13:14 +01:00
soupette	835a26e8c3	Fix ctm	2019-02-11 14:49:10 +01:00
soupette	72cc7d0837	Remove separate store for users-permissions	2019-02-11 13:55:49 +01:00
Ky	c1ffbbfb57	Content manager Links with injected components (UI in progress)	2019-02-08 19:23:02 +01:00
Jim LAURIE	b8045455da	Add migration alpha-23	2019-02-07 10:40:04 +01:00
Brinley Ang	211624958f	Merge branch 'master' into patch-2	2019-02-05 13:44:05 +11:00
Jim LAURIE	f7e25c34e8	Merge branch 'master' into ui/minor-updates	2019-01-31 18:08:15 +01:00
Ky	1cf546536f	HomePage fr trad fix	2019-01-30 19:19:37 +01:00
Jim LAURIE	0684628985	Merge branch 'master' into split-ctm-settings-view	2019-01-30 18:24:47 +01:00
soupette	887515933f	Move dependencies to devDependencies	2019-01-30 18:13:52 +01:00
soupette	8b602c6273	Fix links HomePage and remove letter-spacing in ctm table	2019-01-30 15:21:31 +01:00
soupette	fc73f90d75	Force overlayBlocker to be displayed when installing a plugin	2019-01-30 13:40:12 +01:00
soupette	3366825452	Remove cache on fetch oplugins	2019-01-30 13:25:08 +01:00
soupette	eb7daf9a73	Created new container for marketplace	2019-01-30 12:01:17 +01:00
Brinley Ang	4b65132ffe	Updated notifications container position to fixed	2019-01-29 17:30:47 +11:00
soupette	e4ffd70b90	Split view	2019-01-24 18:30:51 +01:00
Aurélien Georget	48fabe4567	Redesign marketplace and add new blocker component	2019-01-24 18:24:24 +01:00
Jim LAURIE	f90255bb75	Merge branch 'master' into issue/2327	2019-01-22 13:52:13 +01:00
Jim LAURIE	712e997c54	Merge branch 'master' into admin-russian-locale-fixes	2019-01-15 20:29:21 +01:00