yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-11 19:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 122 Branches 483 Tags
Commit Graph

1368 Commits

Author SHA1 Message Date
Convly
a50f93ff1c Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-08-25 15:09:15 +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
Alexandre Bodin
03ba7cf3d9 Migrate loaders and cleanups 2021-08-24 17:56:49 +02:00
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +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
8972d78e8d v3.6.8 2021-08-24 11:00:41 +02:00
markkaylor
b1ff616fd5 add generators to cli (#10779) 
* add generators to cli

* add strapi generate comment

* remove old generators

* rename generator-cli -> generate

* list generators alphabetically

* update package description

* add check for strapi app in cwd
 2021-08-23 16:17:54 +02:00
Convly
40c93fe6c6 Merge branch 'v4/backend' into v4/graphql-schema-generation-refactor 2021-08-23 16:11:57 +02:00
Alexandre Bodin
cf1d5dc33c Remove unneeded extension 2021-08-23 15:09:19 +02:00
Alexandre BODIN
bedf34a69a
Update homepage.settings.json 2021-08-23 10:34:02 +02:00
Pierre Noël
514fc00d97 migrate getStarted api 2021-08-23 09:58:15 +02:00
Alexandre Bodin
c3642a4f10 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-19 23:29:55 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
Alexandre Bodin
5202c4ed5c v3.6.7 2021-08-19 09:32:12 +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
HichamELBSI
f568ce08bd Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-16 18:38:24 +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
63cc0832f2 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-13 15:43:04 +02:00
Pierre Noël
2d7454553a add extension system for content-types 2021-08-13 15:35:19 +02:00
Convly
cf76db2c18 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-08-13 11:11:50 +02:00
HichamELBSI
b97383ff18 Migrate SSO providers view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-12 17:10:04 +02:00
Alexandre Bodin
11afe17575 Init new REST API format and remove count as it is included in pagination 2021-08-11 11:12:56 +02:00
Pierre Noël
f4981dd8e7 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-10 15:33:06 +02:00
Alexandre Bodin
9c74f0a84e Fix some database schema sync 2021-08-10 09:36:02 +02:00
Convly
e6a139dde7 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-08-09 18:41:38 +02:00
Alexandre Bodin
38e435c165 Remove old hook 2021-08-09 18:38:17 +02:00
Alexandre BODIN
d54610dc06
Remove hooks (#10711) 2021-08-09 17:33:02 +02:00
Pierre Noël
18da6e2188 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-09 11:06:34 +02:00
Pierre Noël
4790e28284 refactor with module approach 2021-08-06 18:09:49 +02:00
Alexandre Bodin
7f5ca6b479 Fix db config for pg and mysql in getstarted 2021-08-06 09:18:11 +02:00
Convly
0e8025df6b Merge branch 'releases/v4' into v4/graphql-resolvers-rewrite 2021-08-05 14:39:16 +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
805e7fdb4b Merge branch 'master' into releases/v4 2021-08-04 19:24:10 +02:00
Alexandre Bodin
1941cfbf4d Add a generic subscriber to run the model lifecycles 2021-08-04 17:47:38 +02:00
Alexandre Bodin
e63fb9d509 v3.6.6 2021-08-04 17:06:51 +02:00
Pierre Noël
dd0c095f1e Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-04 15:05:56 +02:00
Alexandre Bodin
10ef480bc0 Move logger out of Strapi.js 2021-08-03 09:12:58 +02:00
Alexandre Bodin
a0011840e8 Merge admin config into strapic config 2021-08-03 08:33:56 +02:00
Alexandre Bodin
c02ceab686 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-02 08:32:02 +02:00
Alexandre Bodin
16b01043d7 Fix CTB inversion of dominance in relations 2021-07-30 14:53:57 +02:00
Convly
210434dab9 Merge v4/backend into v4/graphql-resolvers-rewrite 2021-07-30 11:47:23 +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
Alexandre Bodin
4d471a50a8 Update CTB validations for morphs 2021-07-30 09:44:17 +02:00
Pierre Noël
3b179169d4 wip 2021-07-29 16:39:26 +02:00
Alexandre Bodin
651577baa6 Remove morph relations from the CM infos 2021-07-29 14:39:28 +02:00
soupette
55ad0c0181 Update plugin generators 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-28 08:22:59 +02:00