yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 12:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,804 Commits 121 Branches 494 Tags
Commit Graph

681 Commits

Author SHA1 Message Date
Alexandre Bodin
48893ae3fc v4.0.3 2022-01-05 16:50:20 +01:00
Jean-Sébastien Herbaux
dd0c256cef
Merge branch 'master' into fix/graphql-enum-not-generated 2022-01-05 16:11:54 +01:00
Kim, Harim
0fd0f57126
Fix Update user does not update component attribute (#11871) 
* use entityService to update user instead of old query, add update test

Signed-off-by: harimkims <harimkims@gmail.com>

* fix e2e test

* Add component update test

* Remove console.log

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2022-01-05 15:54:58 +01:00
soupette
b234d91c4f Merge branch 'master' of github.com:strapi/strapi into upgrade-webpack-config 2022-01-04 15:30:26 +01:00
soupette
61fe669fb6 Specify minimum node version to be 12.22.0 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 11:55:52 +01:00
harimkims
f91376c407 Remove console.log 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-23 11:44:40 +09:00
harimkims
780247117f Fix GraphQL enums are genereated as String type 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-23 10:59:24 +09:00
Convly
0c558d92fa Take the playgroundAlways option into account for the graphql playground 2021-12-22 17:15:46 +01:00
Alexandre Bodin
fd656a4769 v4.0.2 2021-12-22 16:04:10 +01:00
Alexandre Bodin
e2cd01e8c6 v4.0.1 2021-12-22 10:43:38 +01:00
Kim, Harim
93de45cc2e
Add test for Content API filter by locale (#11961) 
* Fix unable to filter by locale

Signed-off-by: harimkims <harimkims@gmail.com>

* Fix failed e2e test

* Revert modifying decorator test, Add locale filter key

* Revert supporting both locale, _locale format

* Replace _locale with locale

* Replace _locale params with locale in test

* Rename testing for default locale filtering

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2021-12-21 13:43:25 +01:00
Kim, Harim
bd0aa9e9f5
Fix unable to reset password in GraphQL mutation (#11964) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-21 11:45:18 +01:00
Fabien del Carmen
66ca7b2f4f
Merge branch 'master' into chore/test-config 2021-12-14 16:32:01 +01:00
Alexandre BODIN
8ae6fd5ae7
Merge branch 'master' into chore/test-config 2021-12-14 15:56:27 +01:00
Alexandre BODIN
a7ddc34d4e
Merge branch 'master' into fix/11789 2021-12-14 14:11:50 +01:00
Alexandre BODIN
12852dd36c
Merge pull request #11479 from strapi/v4/fix-fetch-all-entries 
Fetch all entries with limit -1
 2021-12-14 14:04:26 +01:00
harimkims
26c8dfbe5f send filter in context query 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-14 19:30:24 +09:00
vincentbpro
a5ac20dda0 fix: avoid divided by zero issue 2021-12-14 10:41:47 +01:00
Alexandre BODIN
da73164fbc
Merge pull request #11734 from iicdii/translation-ko 
Update ko translation, add missing key
 2021-12-14 10:14:09 +01:00
Alexandre BODIN
398ecd9071
Merge pull request #11752 from strapi/v4/product-copy-text-changes-v1 
Product copy text changes v1
 2021-12-09 10:13:34 +01:00
harimkims
74dee39682 Fix unable to filter users, add e2e test 2021-12-04 21:50:54 +09:00
Pierre Noël
d676242c8f Fix saving up settings 2021-12-03 11:49:22 +01:00
Vincent
1a507c0777
Merge branch 'master' into v4/product-copy-text-changes-v1 2021-12-03 09:09:36 +01:00
vincentbpro
eab466bb65 Merge branch 'master' into v4/fix-fetch-all-entries 2021-12-02 16:04:49 +01:00
Kim, Harim
2b635fe656
Enumeration filter support for GraphQL (#11754) 
* Enumeration filter support for GraphQL

Signed-off-by: harimkims <harimkims@gmail.com>

* Fix failed e2e test
 2021-12-02 11:55:29 +01:00
vincentbpro
36bfa44b70 Merge branch 'master' of github.com:strapi/strapi into v4/product-copy-text-changes-v1 2021-12-01 18:15:44 +01:00
vincentbpro
aabdddf7a5 style: small text fixes 2021-12-01 17:52:45 +01:00
Fabien del Carmen
e1ff4b052c
Merge branch 'master' into chore/test-config 2021-12-01 11:20:39 +01:00
harimkims
1d3c57b462 Update ko translation, add missing key 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-01 09:27:19 +09:00
Convly
df8bfe46e9 Merge branch 'master' of github.com:strapi/strapi into plugins/graphql/fix-upload-scopes-and-bump-version 2021-11-30 16:34:35 +01:00
Convly
0d7d430469 Bump graphql-upload version & link content API scope to the custom mutations 2021-11-30 16:27:59 +01:00
Alexandre BODIN
365c8e45d6
Merge pull request #11721 from strapi/chore/remove-snyk-files 
Remove snyk files. We switched to their github integration instead
 2021-11-30 15:04:19 +01:00
Pierre Noël
14651530cc remove todos that are already done 2021-11-30 14:47:45 +01:00
Alexandre Bodin
57ec94a4ce Remove snyk files. We switched to their github integration instead 2021-11-30 14:22:48 +01:00
fdel-car
3864399eb8 Merge branch 'master' into chore/test-config 2021-11-30 12:36:11 +01:00
Alexandre Bodin
8b9d095388 Update snapshots 2021-11-30 12:00:44 +01:00
vincentbpro
c6ba164481 style: text change settings i18n 2021-11-30 11:25:51 +01:00
vincentbpro
b50d83729c style: text change go back 2021-11-30 10:57:56 +01:00
Alexandre Bodin
b181702f02 v4.0.0 2021-11-29 20:16:44 +01:00
Alexandre Bodin
bda6c8a95b Merge master 2021-11-29 18:46:14 +01:00
DMehaffy
7e874e00a0 Update all documentation links to new docs url (#11424) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-11-29 18:13:52 +01:00
Alexandre BODIN
6e0f205213
Merge pull request #11708 from strapi/v4/fix-defaults-provider 
Remove defaults key from stored grant config
 2021-11-29 17:38:22 +01:00
Dieter Stinglhamber
cb7f44ea41 make author and maintainers field consistent accross packages 2021-11-29 16:23:55 +01:00
Pierre Noël
b0b4135ce0 remove defaults key from stored grant config 2021-11-29 16:05:45 +01:00
Alexandre Bodin
c288dcb902 Cleanup and normalize package.json files 2021-11-29 15:13:33 +01:00
soupette
e091680e98 Fix admin helmet 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-29 11:08:56 +01:00
cyril lopez
f957ddd933
Merge pull request #11704 from strapi/fix-cm-permissions 
[v4] Fix CM permissions with locales
 2021-11-29 10:49:25 +01:00
Alexandre Bodin
1d6e3ef529 Fix url join 2021-11-29 10:41:26 +01:00
soupette
7e8a11b80d Fix CM permissions with locales 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-29 10:31:27 +01:00
Alexandre BODIN
cd4c8590ab
Merge pull request #11689 from strapi/v4/doc-plugin-fix 
Fix plugin crashing when content type gets deleted
 2021-11-29 09:54:28 +01:00