yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,462 Commits 121 Branches 507 Tags
Commit Graph

7462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
e56e46e030 Split admin and users. 
Co-authored-by: lauriejim
 2019-04-09 12:09:03 +02:00
virginieky
8a5eab41f8
Merge pull request #3076 from strapi/front/admin-new-hook-architecture-admin-rework 
Front/admin new hook architecture admin rework
 2019-04-09 09:55:46 +02:00
soupette
9ea1eb4821 Fix PR feedback 2019-04-08 20:07:06 +02:00
soupette
3c108fe555 Fix PR feedback 2019-04-08 20:04:30 +02:00
soupette
82459b4726 Fix PR feedback 2019-04-08 19:54:30 +02:00
soupette
e5393acf66 Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-admin-rework 2019-04-08 16:20:21 +02:00
cyril lopez
b124d327c1
Merge pull request #3073 from strapi/front/admin-new-hook-architecture-lifecycle 
Front/admin new hook architecture lifecycle
 2019-04-08 15:51:16 +02:00
soupette
fb1c404f56 Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-lifecycle 2019-04-08 13:53:31 +02:00
cyril lopez
72af5c4e42
Merge pull request #3071 from strapi/front/admin-new-hook-architecture-load-plugin 
Front/admin new hook architecture load plugin
 2019-04-08 13:52:18 +02:00
soupette
f37f740aba Fix PR feedback 2019-04-05 00:50:14 +02:00
Jim LAURIE
500374d6c0
Merge pull request #3070 from strapi/front/admin-new-hook-architecture-update-generators 
Front/admin new hook architecture update generators
 2019-04-04 14:09:24 +02:00
soupette
1af75af8f0 Remove Loadable 2019-04-04 13:49:46 +02:00
soupette
90682b9106 Fix conflicts 2019-04-03 19:37:38 +02:00
soupette
fcbd7f9ec6 Fix cypress test 2019-04-03 19:02:19 +02:00
soupette
59587d02cd Fix forgot password views 2019-04-03 17:26:31 +02:00
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
a8a59678fe
Merge pull request #2999 from abdonrd/patch-1 
Added comment to improve linting of generated service files
 2019-04-03 13:47:33 +02:00
Jim LAURIE
ba1c198c5f
Merge branch 'master' into patch-1 2019-04-03 13:47:25 +02:00
Jim LAURIE
61a4d68272
Merge pull request #3010 from strapi/fix/travis-build 
Run snyk only on non fork repo
 2019-04-03 13:46:57 +02:00
soupette
4a18512122 Fix plugins.toJS in all plugins 2019-04-03 13:22:50 +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
Jim LAURIE
b4fc5746bb
Merge branch 'master' into fix/travis-build 2019-04-03 12:40:23 +02:00
Jim LAURIE
e2d2bd1cef
Merge branch 'master' into patch-1 2019-04-03 12:26:48 +02:00
Jim LAURIE
0451b3f57a
Merge pull request #3079 from strapi/pause-pullrequests 
Add PR merge pause
 2019-04-03 10:10:22 +02:00
Jim LAURIE
2fabe80c6f
Merge branch 'master' into pause-pullrequests 2019-04-03 10:10:11 +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
Jim LAURIE
f0eaa58d8d Add PR merge pause 2019-04-02 20:02:09 +02:00
soupette
51836b1471 Merge branch 'improve/ctb-feedback' of github.com:strapi/strapi into front/admin-new-hook-architecture-admin-rework 2019-04-02 19:54:50 +02:00
soupette
3494f49cfc Fix Immutable and associated tests 2019-04-02 19:50:41 +02:00
soupette
f99850ea8d Fix delete model 2019-04-02 18:45:47 +02:00
soupette
b8c9c0ef3e Created the injectHooks HOC 2019-04-02 17:48:19 +02:00
soupette
e1977d28ca Add test to App container 2019-04-02 17:44:25 +02:00
Jim LAURIE
798c6d1d5d
Merge pull request #3029 from strapi/fix/3000 
Fix Blue button
 2019-04-02 17:09:33 +02:00
Jim LAURIE
82e2079d54
Merge branch 'master' into fix/3000 2019-04-02 17:09:25 +02:00
soupette
be95294bdc Add lifecycles to all plugins 2019-04-02 14:17:01 +02:00
soupette
55ac5d5179 Add initializer container to all plugins 2019-04-02 14:06:44 +02:00
soupette
efc889725e Fix conflicts 2019-04-02 13:46:29 +02:00
soupette
3053a01e3b Update generators to the new architecture 2019-04-02 13:45:00 +02:00
soupette
0cd5473675 Update generators to the new architecture 2019-04-02 13:30:35 +02:00
soupette
67099a676a Fix PR feedback 2019-03-29 16:33:05 +01:00
soupette
4b483ce6d8 Merge branch 'master' of github.com:strapi/strapi into improve/ctb 2019-03-29 15:56:53 +01:00
Jim LAURIE
1845353a02
Merge pull request #3038 from strapi/stm/remove-react-select 
Fix languages in settings manager
 2019-03-29 14:33:44 +01:00