yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-14 12:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,700 Commits 119 Branches 483 Tags
Commit Graph

1340 Commits

Author SHA1 Message Date
Alexandre Bodin
c173fa416e wip 2021-09-15 19:53:15 +02:00
Pierre Noël
de4579b25e change project structure to use /src folder 2021-09-15 16:41:36 +02:00
Convly
bb7a2470ee Update graphql extension example (myplugin) 2021-09-15 15:56:47 +02:00
soupette
5a7dbe742a Display relations and medias 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-14 07:34:48 +02:00
Alexandre Bodin
0f3f984ea7 Init migration v4 
- Hooks registry
- D&P CT migrations
- i18N CT migrations
- Umzug with js / sql migrations
- Eslint updates
 2021-09-13 12:03:12 +02:00
soupette
528a56d4e9 Add kitchensink app 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-08 10:25:15 +02:00
soupette
b7f521603e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 13:55:15 +02:00
Jean-Sébastien Herbaux
2b715a6ee9
V4/graphql configuration (#10896) 
* Use a scalar to register the i18n locale arg

* Remove useless files & comments

* Use custom config for apollo server & the pagination (better handling of pagination)

* Fix missing strapi variable being transmitted to wrapResolvers/parseMiddlewares

* PR review comments
 2021-09-07 11:23:49 +02:00
Convly
e2be869d3b Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-07 11:22:43 +02:00
Alexandre BODIN
76d1ac7ada
Merge pull request #10877 from strapi/v4/migrate-email-upload-plugin 
Make email, upload, CM and CTB plugins internal
 2021-09-06 13:36:53 +00:00
Pierre Noël
70eec366f9 make email, upload, CM and CTB plugins internal 2021-09-03 15:24:32 +02:00
Pierre Noël
13cec4cadb append strapi.dir to plugin path if relative 2021-09-02 12:14:44 +02:00
Alexandre BODIN
c1bc942632
Merge pull request #10846 from strapi/v4/rest-api 
v4/rest api
 2021-09-02 10:05:17 +02:00
Pierre Noël
56ffa3a63f migrate myplugin to v4 2021-09-01 18:38:40 +02:00
Convly
e76e7462b7 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-01 14:10:10 +02:00
Alexandre Bodin
4b81731941 Fix tests 2021-08-31 19:31:32 +02:00
Alexandre Bodin
b44a552eee Implement REST API pagination with paged or offset and withCount 2021-08-31 19:31:31 +02:00
Alexandre Bodin
44cf9e161a Load api policies 2021-08-30 17:02:41 +02:00
Alexandre Bodin
8522ef7dfd Add Api load with modules container 2021-08-30 17:02:40 +02:00
Alexandre Bodin
4be69e8bde Init new API loading 2021-08-30 17:02:40 +02:00
Pierre Noël
9362311924 add extend fn to controller registry 2021-08-30 11:00:30 +02:00
Mark Kaylor
5411a8e7c9 resolve merge conflicts 2021-08-27 15:06:52 +02:00
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