20877 Commits

Author SHA1 Message Date
Guy Thomas
b3e2e4db35 unpin graphql and regenerate lockfile 2021-12-10 11:02:22 +11:00
derrickmehaffy
3abba613ce forgot the diff 2021-12-09 15:02:40 -07:00
harimkims
5414bb8793 fix internal plugin's enabled flag ignore user plugin's enabled
- make `get-user-plugins-config` function as independent function

- when you load enabled plugins, use `get-user-plugins-config` function so that it recognizes user's plugin config per environment

Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-10 04:41:07 +09:00
derrickmehaffy
e16bf9b259 Switch Enum from native type to string or text
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2021-12-09 12:31:52 -07:00
harimkims
6bb5403ccb simplify join
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-09 21:55:41 +09:00
Alexandre BODIN
073f279e91
Merge pull request #11791 from Webbist-dev/fix/create-component-visibility-production
Set visibility on create component button when in production
2021-12-09 13:53:23 +01:00
harimkims
bf62193912 use lodash/fp merge instead lodash
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-09 20:53:36 +09:00
harimkims
b56bd71be9 apply feedback
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-09 20:48:42 +09:00
Kim, Harim
de3ee7e98a
Merge branch 'master' into fix/11774 2021-12-09 20:16:41 +09:00
vincentbpro
9aaf323223 style: email settings text change 2021-12-09 11:41:23 +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
Alexandre BODIN
b1ba3c6b1c
Merge pull request #11780 from strapi/fix/save-up-settings
Fix saving up settings
2021-12-09 09:56:33 +01:00
Alexandre BODIN
2c49c531ba
Merge pull request #11749 from strapi/fix/cli-ct-attribute-generator
Fix the attribute generation for the CT generator
2021-12-09 09:28:52 +01:00
Dieter Stinglhamber
cf5af8b189 update gitignore 2021-12-09 08:54:39 +01:00
Yuku Takahashi
b019507e58 Skip if dependency doesn't export package.json 2021-12-08 23:10:09 +09:00
vincentbpro
7183aa443c style: small text changes 2021-12-07 17:36:57 +01:00
MatsubaraDaisuke
b3ce259c47
Merge branch 'master' into matsubara-japanese-translation-fix 2021-12-07 21:33:50 +09:00
derrickmehaffy
d32c487176 one more fix 2021-12-07 09:27:59 +01:00
DMehaffy
20deb8d3ec Fix typo in in AWS-S3 Provider ReadMe
I forgot to end my code block 🙈
2021-12-07 09:27:59 +01:00
matsubara
74b96a56dc Update ja.json 2021-12-07 00:51:29 +09:00
Jasper De Smet
5c2431916f
Update nl.json
Fix: translation (dutch "dt-rule" mistake)
2021-12-06 10:36:50 +01:00
harimkims
ae58d85103 rename function
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-05 08:19:15 +09:00
harimkims
411a04398f fix unable to get plugin config per env-config
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-05 07:53:23 +09:00
harimkims
74dee39682 Fix unable to filter users, add e2e test 2021-12-04 21:50:54 +09:00
Jakob Sjöqvist
462cddc052 Replace npm with yarn in contributing 2021-12-04 12:00:37 +01:00
Alex Bennett
f5559be427 Set visibility on create component button when in production 2021-12-03 23:16:59 +00:00
Pierre Noël
2c2800dfda
Merge branch 'master' into fix/save-up-settings 2021-12-03 11:51:41 +01:00
derrickmehaffy
6ee0ba1953 PR Feedback
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2021-12-03 11:50:01 +01:00
derrickmehaffy
982e90d637 Unify provider READMEs and add Upload CSP config examples
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2021-12-03 11:50:01 +01:00
derrickmehaffy
2be761b73a Finish fixing the email provider readmes
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2021-12-03 11:50:01 +01:00
Pierre Noël
d676242c8f Fix saving up settings 2021-12-03 11:49:22 +01:00
ronronscelestes
bb53ba8638
CM LV Settings Dnd fixes (#11755)
* fixed draglayer for dnd

* used drag sibling logic to remove hover state bug

* updated snapshots
2021-12-03 09:31:52 +01:00
Vincent
1a507c0777
Merge branch 'master' into v4/product-copy-text-changes-v1 2021-12-03 09:09:36 +01:00
harimkims
d68c4769e9 Fix falling front unit test
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-03 04:39:51 +09:00
harimkims
2461a73a6c Fix unable to download original image in uploader
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-03 04:11:44 +09:00
vincentbpro
558110dcdf refactor: removed variables not used 2021-12-02 17:51:13 +01:00
Vincent
11f3519710
Merge pull request #11766 from strapi/interface-language-help-message
feat: added interface language help message
2021-12-02 17:25:49 +01:00
vincentbpro
7a85b712f9 Merge branch 'v4/fix-fetch-all-entries' of github.com:strapi/strapi into v4/fix-fetch-all-entries 2021-12-02 16:53:19 +01:00
vincentbpro
3ed7f1c293 fix: removed -1 limit handling for REST 2021-12-02 16:47:56 +01:00
Vincent
ca0b09f22f
Merge branch 'master' into interface-language-help-message 2021-12-02 16:30:46 +01:00
vincentbpro
eab466bb65 Merge branch 'master' into v4/fix-fetch-all-entries 2021-12-02 16:04:49 +01:00
Vincent
56f3b4041f
Update packages/core/strapi/lib/core-api/service/__tests__/index.test.js
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
2021-12-02 16:02:01 +01:00
Dieter Stinglhamber
bc38486188 update fs package 2021-12-02 15:17:22 +01:00
Dieter Stinglhamber
5b39f3fb3d add test for the content type generator 2021-12-02 15:17:21 +01:00
Dieter Stinglhamber
690c1f7965 fix the attribute generation for the CT generator 2021-12-02 15:17:21 +01:00
vincentbpro
4546823279 feat: added interface language help message 2021-12-02 14:56:11 +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
Alexandre Bodin
5845041665 Add build npm script so the admin gets built on mono repo setup 2021-12-02 10:34:03 +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