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,562 Commits 121 Branches 507 Tags
Commit Graph

7562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
554fc7654a Clean files 2019-04-17 11:45:55 +02:00
soupette
507357f878 Fix wrong import 2019-04-17 11:21:46 +02:00
soupette
c539dbce35 Fix build helper plugin 2019-04-17 11:18:40 +02:00
soupette
579aa7705a Remove router context 2019-04-16 18:47:58 +02:00
soupette
88e3a7d1d6 Load upload 2019-04-16 18:23:26 +02:00
soupette
6d31833a58 Load stm 2019-04-16 18:16:44 +02:00
soupette
d6e8ff0807 Load doc 2019-04-16 18:05:12 +02:00
soupette
c7b7fddaba Load ctb 2019-04-16 18:03:50 +02:00
soupette
a9886f3105 Load ctm 2019-04-16 17:48:17 +02:00
soupette
61f115fbee Load users and email 2019-04-16 16:55:53 +02:00
soupette
e1d619065b Update peerdependencies and fix duplicate modules 2019-04-16 12:54:16 +02:00
soupette
751a794ca8 Change imports with helper plugin 2019-04-16 11:53:29 +02:00
soupette
b68a04d0fc Add rollup to strapi-helper-plugin 2019-04-16 09:38:15 +02:00
soupette
1f83ef123e Init rollup 2019-04-15 18:35:01 +02:00
soupette
7043840cbd Change remove helper plugin deps 2019-04-12 18:23:26 +02:00
soupette
88ff38d925 Created new webpack config, the load of the plugins is not handled yet 2019-04-11 19:07:00 +02:00
soupette
a1f4cc1a4c Fix delete user cypress 2019-04-10 15:57:12 +02:00
soupette
d7bf1d0c4f Fix e2e tests 2019-04-10 14:32:59 +02:00
soupette
1544cdf877 Fix PR feedback 2019-04-09 18:35:49 +02:00
soupette
a2192c1dec Fix conflicts 2019-04-09 16:01:01 +02:00
soupette
c60457f3c7 Fix conflicts 2019-04-09 14:22:13 +02:00
soupette
e56e46e030 Split admin and users. 
Co-authored-by: lauriejim
 2019-04-09 12:09:03 +02:00
Jim LAURIE
6ec2b17e80
Merge pull request #2954 from strapi/improve/ctb 
Content type builder Front-end refactoring
 2019-04-09 10:46:44 +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
85bec881fc Remove babel from back jest config 2019-04-08 19:03:55 +02:00
soupette
7027606a1d Merge branch 'master' of github.com:strapi/strapi into improve/ctb 2019-04-08 17:16:06 +02:00
soupette
59b95280ea Remove front end test until we update the webpack configuration so it uses babel 7. 
The front-end tests are broken in the CI because the backend needs jest v 24 with babel 7 and the front-end need jest 23 with babel 6. Since the webpack config will be entirely reworked it better to disable the tests in the CI until the webpack cinf is updated.
 2019-04-08 17:15:20 +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
2899e2a05d Fix remove and edit 2019-04-08 13:51:18 +02:00
soupette
251256d09f Remove useless false required in the model s attributes 2019-04-05 16:57:27 +02:00
soupette
8fa7332f03 Clean fields 2019-04-05 16:49:26 +02:00
soupette
057da77b05 Add new plugin for class properties 2019-04-05 15:51:16 +02:00
soupette
4e11597e1f Remove threshold 2019-04-05 11:39:05 +02:00
soupette
f37f740aba Fix PR feedback 2019-04-05 00:50:14 +02:00
soupette
55d0fbfeea Remove the modal s auto opening after the submit of an edited field 2019-04-05 00:46:25 +02:00
soupette
c62da404a5 Merge branch 'improve/ctb' of github.com:strapi/strapi into improve/ctb 2019-04-04 19:28:25 +02:00
soupette
441a140106 Fix order on edit attribute 2019-04-04 19:27:31 +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
Jim LAURIE
196fa038bd
Merge pull request #2961 from strapi/feature/deep-filtering-mongoose-bookshelf 
Deep filtering
 2019-04-04 12:40:58 +02:00
Jim LAURIE
abece404ca
Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf 2019-04-04 12:06:12 +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