724 Commits

Author	SHA1	Message	Date
soupette	f344e33341	Fix tests that wasn't working with the router import	2019-03-09 11:06:43 +01:00
soupette	bac6dad0a6	Fix conflicts	2019-03-09 10:39:35 +01:00
Jim LAURIE	73b31d4e27	Merge branch 'master' into events	2019-03-08 15:56:50 +01:00
soupette	533c8fed0d	Init attributes list	2019-03-07 17:54:50 +01:00
Jim LAURIE	8d01b9380c	Update 30s to 15s	2019-03-07 15:10:09 +01:00
Jim LAURIE	b6bdf6f7ce	Merge branch 'master' into improve/blockerComponent	2019-03-07 14:38:40 +01:00
Jim LAURIE	26ac833855	Merge branch 'master' into add-granularity-of-max-size-upload-for-file-upload	2019-03-07 14:36:32 +01:00
Jim LAURIE	8241863444	Merge branch 'master' into enhancement/bigint	2019-03-07 13:42:16 +01:00
soupette	a35d402bde	Created commonPropTypes folder to avoid code duplication	2019-03-07 11:39:55 +01:00
Aurélien Georget	03d212d10f	Fix conflicts	2019-02-28 14:44:01 +01:00
REDDY PRASAD	5fa45859c9	💅 Implement 'step' feature for InputNumber component	2019-02-28 16:28:06 +05:30
soupette	2448bc63fe	Fix button delay	2019-02-27 17:51:41 +01:00
soupette	d3a4c2a6f3	Add new state to overlay blocker	2019-02-27 17:48:06 +01:00
Ky	38b0d616bc	CSS tidy	2019-02-26 17:11:13 +01:00
virginieky	9a7bdb0247	Merge branch 'master' into onboarding-videos	2019-02-25 14:59:35 +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	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
soupette	ab158dddd6	Change to absolute path strapi-helper	2019-02-22 10:22:21 +01:00
Aurélien Georget	6cb88302ca	Add events content manager	2019-02-20 18:23:25 +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
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
Ky	cbb53ac8d4	Content manager edit layout and fields links list	2019-02-12 10:50:41 +01:00
soupette	e8816d93a4	Merge branch 'master' of github.com:strapi/strapi into single-redux-store	2019-02-12 09:41:50 +01:00
soupette	d81fba0488	Update tests with the single store	2019-02-11 18:13:14 +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
soupette	da424a4ca7	Fix displayed field on remove	2019-02-04 17:03:51 +01:00
DMehaffy	339c756e05	Merge branch 'master' into enhancement/bigint	2019-01-30 23:04:39 -07:00
Jim LAURIE	2199fa3943	Merge branch 'master' into fix/#1960	2019-01-30 17:39:35 +01:00
soupette	eb7daf9a73	Created new container for marketplace	2019-01-30 12:01:17 +01:00
Aurélien Georget	48fabe4567	Redesign marketplace and add new blocker component	2019-01-24 18:24:24 +01:00
DMehaffy	d656077399	add a few more bigint	2019-01-21 05:11:48 -07:00
soupette	4a160b04fd	Fixes #1960	2019-01-20 14:21:38 +01:00
Jim LAURIE	f87ebea759	Merge branch 'master' into plugin-documentation	2018-12-17 16:22:03 +01:00
soupette	a401739405	Fix lang issue	2018-12-12 11:55:17 +01:00
soupette	54fdbc6897	Add option to copy token in the ui	2018-12-06 19:00:49 +01:00
soupette	a225d144c6	Add selector for errors	2018-11-21 12:57:20 +01:00
soupette	5406b678ac	Add selectors for tests and fix bugs	2018-11-16 09:18:57 +01:00
soupette	779f575b47	Access reducer from cypress	2018-11-13 16:53:50 +01:00
soupette	7a66850aa6	Add ids to buttons in ctb	2018-11-08 16:32:34 +01:00
Jim LAURIE	e42e532f1a	Merge branch 'master' into revert-1928-master	2018-10-18 10:41:38 +02:00
Jim LAURIE	bcb71242a8	Revert "Font-family declarations fixed"	2018-10-09 12:31:16 +02:00
cyril lopez	13f2193f73	Merge branch 'improve-ctm/delete-edit-view' of github.com:strapi/strapi into improve-ctm/delete-edit-view	2018-10-09 12:02:25 +02:00
cyril lopez	d186d33e39	Revert "Fix font-family" ... This reverts commit 220fb2caf8f8ca46ffff5646d62c3adc62c69819.	2018-10-09 11:49:16 +02:00