19985 Commits

Author SHA1 Message Date
yasudacloud
c0e555c562 Translation key correction of wording 2022-02-04 23:38:44 +09:00
Jean-Sébastien Herbaux
c4a6ca50f0
Merge pull request #12227 from kerimabdy/add-tk-iso-code
Add Turkmen ISO 639-1 locale code
2022-02-02 11:42:37 +01:00
Jean-Sébastien Herbaux
ae5010efc2
Merge pull request #12276 from thomas-br/patch-1
Fixing double hashing issue for users-permissions passwords
2022-01-31 11:42:46 +01:00
thomas-br
0e65636013
Removing whitespace 2022-01-29 22:38:55 +01:00
thomas-br
c85208bf97 Merge branch 'patch-1' of github.com:thomas-br/strapi into patch-1 2022-01-29 22:33:34 +01:00
thomas-br
e602d645be correcting entity update 2022-01-29 22:16:18 +01:00
ELABBASSI Hicham
0dd74c685b
Merge pull request #12337 from strapi/fix/required-field
Fix/required field
2022-01-28 16:13:01 +01:00
ronronscelestes
6016485f3c merge bis bis + fix merge conflicts 2022-01-28 15:32:19 +01:00
Alexandre BODIN
8454b34bbf
Merge pull request #12342 from strapi/releases/v4.0.6
v4.0.6
2022-01-28 15:14:07 +01:00
Convly
5b48053946 v4.0.6 v4.0.6 2022-01-28 15:08:27 +01:00
Alexandre BODIN
c0c062c3c2
Merge pull request #12324 from strapi/snyk-fix-c2f78e9094d091bd4def7d96ad082f04
[Snyk] Security upgrade sharp from 0.29.0 to 0.29.3
2022-01-28 15:06:42 +01:00
Jean-Sébastien Herbaux
bace0b9a32
Merge pull request #12340 from strapi/fix/sso-wrong-redirect
Fix SSO redirection
2022-01-28 15:04:52 +01:00
Alexandre BODIN
fb8b6cc124
Merge pull request #12215 from strapi/fix/11936
Fix admin.port not used in the webpack dev server configuration
2022-01-28 14:47:26 +01:00
ronronscelestes
31ea7896ca merge bis + fix merge conflicts 2022-01-28 14:45:51 +01:00
Jean-Sébastien Herbaux
824c7d32d5
Merge pull request #12298 from strapi/fix/admin
Admin enhancements & fixes
2022-01-28 14:38:13 +01:00
cyril lopez
831b7eb9ff
Merge branch 'master' into fix/sso-wrong-redirect 2022-01-28 14:26:12 +01:00
Convly
4fc8e83eb8 Fix redirect path for sso & fix customEERoute 2022-01-28 14:22:14 +01:00
ronronscelestes
4af5e6ded3 Merge branch 'master' of https://github.com/strapi/strapi into fix/required-field 2022-01-28 13:53:56 +01:00
Alexandre BODIN
90d3c76bc7
Merge pull request #12314 from strapi/strapi-helper-plugin/bump-axios
[helper-plugin] bump axios to v0.25.0
2022-01-28 13:33:49 +01:00
Alexandre BODIN
bfa0cf898b
Merge pull request #12313 from strapi/plugins-strapi-dependency
Add strapi as peerDependency to Strapi Market plugins
2022-01-28 13:25:31 +01:00
ronronscelestes
4ac074fa20 Merge branch 'fix/required-field' of https://github.com/strapi/strapi into fix/required-field 2022-01-28 13:11:10 +01:00
ronronscelestes
340eecc00c
Fix - MediaLibraryInput component required (#12336) 2022-01-28 12:52:08 +01:00
ronronscelestes
bb222c995d
Required-field: Bump ds 74 (#12335) 2022-01-28 11:47:47 +01:00
kerimabdy
2b61952e41
Merge branch 'master' into add-tk-iso-code 2022-01-27 16:45:26 +05:00
kerimabdy
704447dc99
Update iso-locales.test.js.snap 2022-01-27 16:04:42 +05:00
HichamELBSI
fdfd0b12a2 Fix markdown preview
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2022-01-27 11:40:31 +01:00
HichamELBSI
3f23b6c01f Fix tests
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2022-01-27 11:40:30 +01:00
HichamELBSI
cfb417689e Admin UI enhancements
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2022-01-27 11:40:30 +01:00
thomas-br
c30ef816ad
Merge branch 'master' into patch-1 2022-01-27 10:16:18 +01:00
thomas-br
d20eb5bcc9 Merge branch 'patch-1' of github.com:thomas-br/strapi into patch-1 2022-01-27 10:15:23 +01:00
thomas-br
5ae82c0edf correcting entity create 2022-01-27 10:15:04 +01:00
snyk-bot
58be9fd854
fix: packages/core/upload/package.json to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-SIMPLEGET-2361683
2022-01-27 05:33:17 +00:00
Mark Kaylor
27708c51a9 bump axios to v0.25.0 2022-01-26 14:49:45 +01:00
Rémi de Juvigny
9737195dcf Add graphql peerdependency 2022-01-26 14:15:01 +01:00
Rémi de Juvigny
de0c1244b2 Add strapi as peerDependency to plugins 2022-01-26 13:14:51 +01:00
Demian Caldelas
69ce8b5287
Fix sanity check for @casl/ability upgrade #12232 (#12265)
* Fix sanity checks for @casl/ability upgrade

* Add comments for previous commit

* Fix sanity checks for @casl/ability upgrade #12232
2022-01-26 09:55:17 +01:00
Alexandre BODIN
980956555d
Merge pull request #12241 from strapi/dependabot/npm_and_yarn/fs-extra-10.0.0
Bump fs-extra from 9.1.0 to 10.0.0
2022-01-25 14:19:21 +01:00
dependabot[bot]
e5d0071e4c
Bump fs-extra from 9.1.0 to 10.0.0
Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.1.0...10.0.0)

---
updated-dependencies:
- dependency-name: fs-extra
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-25 12:28:35 +00:00
Alexandre BODIN
d796cf93fa
Merge pull request #11825 from strapi/fix/enable-session-middleware
Enable session middleware by default (fixes U&P provider authentication)
2022-01-25 13:23:59 +01:00
Pierre Noël
56407e83c5
Merge branch 'master' into fix/enable-session-middleware 2022-01-25 11:07:08 +01:00
Pierre Noël
b48cf115c7 rename APP_SECRETS to APP_KEYS 2022-01-25 11:06:52 +01:00
Alexandre BODIN
644624d441
Merge pull request #11866 from guyathomas/guyathomas/unpin-graphql-version
unpin graphql and regenerate lockfile
2022-01-25 10:41:57 +01:00
thomas-br
3736d08407
Merge branch 'master' into patch-1 2022-01-25 10:40:32 +01:00
Alexandre BODIN
ea5a838837
Merge pull request #12283 from dargmuesli/chore/deps/node-fetch
chore(deps): update node-fetch to v2.6.7
2022-01-25 10:05:43 +01:00
kerimabdy
777b4da519
Merge branch 'master' into add-tk-iso-code 2022-01-25 09:55:51 +05:00
ELABBASSI Hicham
8d52ce4ef5
Merge pull request #12284 from strapi/fix/required-field-json
Fix JSON input required UI
2022-01-24 18:29:13 +01:00
Pierre Noël
46a4dd01b0
Merge branch 'master' into fix/enable-session-middleware 2022-01-24 17:20:04 +01:00
Pierre Noël
83d321a981 better handle env variables in e2e tests 2022-01-24 17:01:51 +01:00
ronronscelestes
b89c9047a3 feedback fix 2022-01-24 16:51:03 +01:00
ELABBASSI Hicham
b03797415b
Merge pull request #12236 from strapi/enh/404-500-pages
Migrate 404 page and init 500 page
2022-01-24 16:07:26 +01:00