yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,507 Commits 121 Branches 507 Tags
Commit Graph

95 Commits

Author SHA1 Message Date
soupette
cba6116d83 Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-09 15:14:58 +02:00
soupette
c4325b4fd0 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-08 14:10:38 +02:00
soupette
b7f521603e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 13:55:15 +02:00
soupette
0f08ab54d1 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-06 14:03:37 +02:00
soupette
d31b2168df Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 17:03:33 +02:00
soupette
3ef754a64b Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 15:04:36 +02:00
soupette
a6e64e3c60 Add tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 11:32:36 +02:00
soupette
f5ea60ae1f Migrate ml settings to the new DS 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 09:49:40 +02:00
soupette
2b2ec5aead Add documentation to the useFocusWhenNavigate hook 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-30 08:34:00 +02:00
Alexandre Bodin
7f30925161 Merge branch 'v4/backend' into releases/v4 2021-08-25 14:45:59 +02:00
Alexandre Bodin
1ee2d2c483 Merge branch 'master' into releases/v4 2021-08-25 14:44:32 +02:00
soupette
8cc31618b3 Merge branch 'releases/v4' of github.com:strapi/strapi into improve-bundle 2021-08-24 15:08:34 +02:00
Alexandre Bodin
f4a4e2ce26 Move routes to js when possible and refactor policies to be objects 2021-08-24 13:59:43 +02:00
Pierre Noël
bc56be3560 Merge branch 'pluginAPI/loadPlugin' of github.com:strapi/strapi into pluginAPI/loadPlugin 2021-08-20 16:32:14 +02:00
Pierre Noël
09945a46df fixes 2021-08-20 15:23:02 +02:00
Alexandre Bodin
575cbbdc7c Migrate plugin getters 2021-08-19 23:30:49 +02:00
Alexandre Bodin
c3642a4f10 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-19 23:29:55 +02:00
Pierre Noël
98719b6c64 migrate plugin structures to V4 2021-08-19 16:49:33 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
soupette
48239ab116 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:30:45 +02:00
Pierre Noël
682e877644 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-18 18:37:57 +02:00
Pierre Noël
c547e64571 fix e2e tests 2021-08-18 11:58:17 +02:00
Alexandre Bodin
fd86d1926f Handle polymorphic relation field filter and order 2021-08-17 18:08:42 +02:00
Pierre Noël
face75bcba Merge branch 'pluginAPI/loadPlugin' into v4/plugin-api/extensions 2021-08-13 15:43:25 +02:00
Pierre Noël
2d7454553a add extension system for content-types 2021-08-13 15:35:19 +02:00
Pierre Noël
f4981dd8e7 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-10 15:33:06 +02:00
Pierre Noël
18da6e2188 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-09 11:06:34 +02:00
Alexandre BODIN
6ed18de85b
Rename _sort filter to sort (#10688) 2021-08-09 10:22:40 +02:00
Pierre Noël
4790e28284 refactor with module approach 2021-08-06 18:09:49 +02:00
Pierre Noël
ce0e67830a Merge branch 'v4/backend' into v4/plugin-api/modules 2021-08-05 13:59:40 +02:00
Alexandre Bodin
ef63639cd3 Fix eslint so we can have the test run 2021-08-04 19:39:40 +02:00
Alexandre Bodin
805e7fdb4b Merge branch 'master' into releases/v4 2021-08-04 19:24:10 +02:00
Pierre Noël
ed050471d7 fix unit tests 2021-08-02 18:47:45 +02:00
Alexandre Bodin
a7fab84994 Merge branch 'v4/pluginAPI' into pluginAPI/loadPlugin 2021-07-30 10:15:50 +02:00
Alexandre Bodin
89fee54582 Merge branch 'v4/backend' into v4/database 2021-07-30 09:50:40 +02:00
Pierre Noël
3b179169d4 wip 2021-07-29 16:39:26 +02:00
Pierre Noël
6dab3a5ebb Merge branch 'v4/database' into pluginAPI/loadPlugin 2021-07-29 10:27:42 +02:00
Alexandre Bodin
7b10521664 Fix search 2021-07-28 21:03:32 +02:00
soupette
6e4604d662 Init dynamic load of plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-28 08:16:15 +02:00
Alexandre Bodin
a9002be38a Add populate v1 for morph relations + create associations 2021-07-26 17:52:59 +02:00
HichamELBSI
389cea978c Bump dependencies (React, React-Dom, React-Query, and Immer) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-07-26 17:51:49 +02:00
Pierre Noël
eabe72f92e WIP 2021-07-26 16:59:59 +02:00
Pierre Noël
9c41753e8a remove comments 2021-07-23 10:33:25 +02:00
cyril lopez
4b1a422208
Merge pull request #10635 from strapi/split-webpack-custom-config 
Split webpack custom config
 2021-07-22 15:51:59 +02:00
HichamELBSI
2d84a10180 Bump react-dnd to v14 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-07-21 16:25:09 +02:00
soupette
446a97e7f1 Remove @buffetjs deps in plugins package.json 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-21 15:41:26 +02:00
soupette
900388755f Rename boot lifecycle to bootstrap 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-21 09:05:20 +02:00
Alexandre Bodin
6d78f94a54 Use getService 2021-07-08 22:07:52 +02:00
Alexandre Bodin
63b503f676 Wip 2021-07-08 21:53:30 +02:00
Alexandre Bodin
81dd94c6ec Refactor all query() calls 2021-07-08 18:15:32 +02:00