yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 17:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,570 Commits 115 Branches 488 Tags
Commit Graph

14451 Commits

Author SHA1 Message Date
harimkims
6bb5403ccb simplify join 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-09 21:55:41 +09: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
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
vincentbpro
7183aa443c style: small text changes 2021-12-07 17:36:57 +01: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
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
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
vincentbpro
558110dcdf refactor: removed variables not used 2021-12-02 17:51:13 +01:00
Vincent
ca0b09f22f
Merge branch 'master' into interface-language-help-message 2021-12-02 16:30:46 +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
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
vincentbpro
3ef5f26ffd feat: added back link to cm 2021-12-01 17:12:44 +01:00
vincentbpro
de3f19c7bf style: text change cm add new 2021-12-01 16:42:05 +01:00
ronronscelestes
23b4fb1d8f
[Admin] Login error message fix (#11747) 
* fixed path to get error message Invalid Credentials

* improved lodash import
 2021-12-01 16:07:06 +01:00
vincentbpro
6e07df58bd feat: added empty contentmanager CTA 2021-12-01 15:24:07 +01:00
vincentbpro
c58b7449b1 tests: updated snapshot 2021-12-01 15:20:13 +01:00
vincentbpro
2f2bbb677a feat: disable test email cta if address in invalid 2021-12-01 12:00:20 +01:00
HichamELBSI
e2b7745f5c Fix webpack 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-12-01 11:02:14 +01:00
vincentbpro
bb149cbd69 feat: added get-help link 2021-12-01 11:02:11 +01:00
vincentbpro
b195742764 style: text change pluralized sidenav items 2021-12-01 10:55:10 +01:00
vincentbpro
6fbca034ac style: text change settings user details 2021-12-01 10:04:12 +01:00
vincentbpro
06c54434d5 style: text change settings email 2021-12-01 09:53:08 +01:00
Alexandre BODIN
f21e094c7e
Merge pull request #11727 from strapi/plugins/graphql/fix-upload-scopes-and-bump-version 
Bump graphql-upload version & link content API scope to the custom mutations
 2021-12-01 09:12:18 +01:00
derrickmehaffy
05d8127b9b Fix provider config examples for v4 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-11-30 10:33:42 -07: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
vincentbpro
55262183ed style: text change settings users 2021-11-30 13:41:38 +01:00
vincentbpro
4aad739e6e style: text change settings webhooks 2021-11-30 12:01:48 +01:00
Alexandre Bodin
8b9d095388 Update snapshots 2021-11-30 12:00:44 +01:00