yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 23:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,084 Commits 138 Branches 514 Tags
Commit Graph

20084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Sébastien Herbaux
ef9a0262b2
Merge branch 'master' into sanitize-filters 2022-01-26 15:47:10 +01:00
Convly
f183ea417b Code performance 2022-01-26 15:45:51 +01: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
Convly
4c41889266 Merge branch 'master' of github.com:strapi/strapi into sanitize-filters 2022-01-24 15:43:51 +01:00
Convly
9fbe72d58a Don't mutate the original filters object 2022-01-24 15:43:38 +01:00
ronronscelestes
d9259f9971 feat: added required UI to JSON input 2022-01-24 12:34:13 +01:00
kerimabdy
8476f4c0dc
Merge branch 'master' into add-tk-iso-code 2022-01-24 15:42:05 +05:00
Pierre Noël
e58b7266e1
Merge branch 'master' into fix/enable-session-middleware 2022-01-24 11:35:01 +01:00
HichamELBSI
6bbdb97634 Fix tests 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-24 11:12:04 +01:00
HichamELBSI
0562ca0578 Fix button props 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-24 11:12:03 +01:00
HichamELBSI
b9333cc0b5 Migrate 404 page and init 500 page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-24 11:12:03 +01:00
ELABBASSI Hicham
740d6fad61
Merge pull request #12282 from strapi/fix/media-lib 
Fix duplicate & crop an image on the media library file edit form
 2022-01-24 11:09:30 +01:00
Jonas Thelemann
b5821b04b4
chore(deps): update node-fetch to v2.6.7 
To resolve https://github.com/advisories/GHSA-r683-j2x4-v87g.
 2022-01-24 11:09:24 +01:00
HichamELBSI
2f29c55cf9 Remove log 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-24 10:24:57 +01:00
HichamELBSI
43e09d4724 Fix duplicate on crop 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-24 10:24:57 +01:00
thomas-br
efcaa982d3 relying on core password-hashing 2022-01-23 14:35:31 +01:00
thomas-br
e3e89ef7bd
Fixing double hashing issue (core entity-service transform) 2022-01-23 14:02:12 +01:00
Felix Fang
ebfcaf1bba
Merge branch 'master' into master 2022-01-23 00:07:02 +08:00
Christian Schuller
7624cb2b3d
Update SECURITY.md (#12257) 
Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
 2022-01-21 14:29:21 -07:00
Pierre Noël
c9b0f048d7 remove url config 2022-01-21 16:39:06 +01:00