845 Commits

Author SHA1 Message Date
soupette
c8d269aeca Fix MarketPlace and plugin documentation proptypes error 2019-04-03 17:06:07 +02:00
soupette
44a00f9c75 Add all features to the new Admin container 2019-04-03 16:40:15 +02:00
soupette
d4027f7064 Pass store to the app 2019-04-03 14:18:56 +02:00
soupette
86fc4d59e3 Merge branch 'master' of github.com:strapi/strapi into front/admin-new-hook-architecture 2019-04-03 14:17:56 +02:00
soupette
5d0427e6c6 Update register plugin 2019-04-03 14:15:51 +02:00
soupette
95f936c8ce Add Onboarding in new Admin container 2019-04-03 14:10:42 +02:00
Jim LAURIE
3c567e8378
Merge branch 'master' into improve/ctb 2019-04-03 13:51:03 +02:00
soupette
0c01ea2121 Fix menu 2019-04-03 13:18:43 +02:00
soupette
afbb2b8da1 Fix load plugin 2019-04-03 13:05:18 +02:00
soupette
d6a3184fd7 Improve fetch main data 2019-04-02 22:45:21 +02:00
soupette
661a89642b Created Admin and PluginDispatcher containers, update the history dependency to remove the error log in the console 2019-04-02 21:23:42 +02:00
soupette
0f554234d8 Created PluginDispatcher component 2019-04-02 20:11:31 +02:00
soupette
67099a676a Fix PR feedback 2019-03-29 16:33:05 +01:00
soupette
f327143ec7 Fixes #3000 2019-03-26 20:54:16 +01:00
soupette
2b4396151c Fix build 2019-03-25 12:15:44 +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
b6bdf6f7ce
Merge branch 'master' into improve/blockerComponent 2019-03-07 14:38:40 +01:00
Jim LAURIE
cfd8e4414b
Merge branch 'master' into patch-2 2019-03-07 14:26:36 +01:00
soupette
b4b025cd17 Display menu in modelPage 2019-03-06 18:50:52 +01:00
soupette
554faaf9c7 Add test config 2019-03-06 09:54:29 +01:00
Aurélien Georget
9090c8effd Fix conflicts 2019-03-01 12:55:43 +01:00
Aurélien Georget
03d212d10f Fix conflicts 2019-02-28 14:44:01 +01:00
soupette
d3a4c2a6f3 Add new state to overlay blocker 2019-02-27 17:48:06 +01:00
Ky
cbb365afae refacto before PR 2019-02-27 17:02:30 +01:00
Ky
b1a01c352d some fixes before PR 2019-02-27 14:49:04 +01:00
Ky
a7b96daab0 FF & Safari fonts 2019-02-27 14:27:18 +01:00
Ky
da50cf098a dirty comments removing 2019-02-27 11:58:46 +01:00
Ky
b7fb018f73 Open videos box on first co optim 2019-02-27 11:55:24 +01:00
Ky
7ddb21c2f7 Trad 2019-02-26 18:22:07 +01:00
Ky
38b0d616bc CSS tidy 2019-02-26 17:11:13 +01:00
Ky
03de112d09 Algo fixes on prod mode 2019-02-26 16:57:32 +01:00
Ky
8c66abdd41 commit before merge 2019-02-26 10:55:30 +01:00
Ky
be68216df3 commit before merge 2019-02-26 10:51:35 +01:00
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