yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 16:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,877 Commits 115 Branches 488 Tags
Commit Graph

20877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pierre Noël
2b069becfa remove log 2022-01-21 15:50:12 +01:00
harimkims
7ca54f6893 Enable to drop image to upload dialog in edit view 2022-01-21 23:27:39 +09:00
Pierre Noël
4d51e8131c
Merge branch 'master' into fix/enable-session-middleware 2022-01-21 14:01:12 +01:00
sunnyson
12d72d71e2
Merge branch 'master' into fix/generator 2022-01-21 14:51:44 +02:00
Marin
621c75ea27 refactor(CLI-Generate): ♻️ add root path support for middlewares & policies 2022-01-21 14:39:22 +02:00
Marin
e1375a80e1 refactor(CLI-Generate): ♻️ fix getFilePath path for plugins 2022-01-21 14:19:02 +02:00
Marin
fc099f4f15 Revert "fixing file paths when generating CT inside plugins" 
This reverts commit 2435689d50b631a30509047a9dabef91120ffe18.
 2022-01-21 12:49:21 +02:00
tuxuuman
3ac3c5eef2
Merge branch 'master' into optimizing-and-refactoring 2022-01-21 07:52:39 +03:00
tuxuuman
73780089a0 returned another important condition 2022-01-21 04:42:07 +00:00
Pierre Noël
597df20411 fix appendFile 2022-01-20 18:48:57 +01:00
Vincent
2094583e45
Merge pull request #12259 from strapi/guided-tour/step-validate-reload 
(Feature: Guided tour) Validate step on reload
 2022-01-20 18:30:33 +01:00
ronronscelestes
048efda2ee fix: feedbacks 2022-01-20 17:40:29 +01:00
ronronscelestes
212c1accdd feat: update guidedTourState on reload if currentStep in locale storage 2022-01-20 17:29:41 +01:00
ronronscelestes
99a229cf66
feat: CTB modals appearance logic 
Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>
Co-authored-by: cyril lopez <cyril@strapi.io>
 2022-01-20 16:55:20 +01:00
kerimabdy
c918587af1
Merge branch 'master' into add-tk-iso-code 2022-01-20 10:03:52 +05:00
Alexandre BODIN
45020eee06 v4.0.5 v4.0.5 2022-01-19 18:44:22 +01:00
Alexandre BODIN
4e143c7718 Update yarn.lock 2022-01-19 18:43:35 +01:00
Pierre Noël
3facd1de7f add env.example back + code style 2022-01-19 17:21:23 +01:00
Pierre Noël
1dc74b0792 add session middleware to new project config + fix test app not using .env 2022-01-19 17:13:00 +01:00
Pierre Noël
8b39d44992 create app keys at app creation instead of runtime auto-generation 2022-01-19 17:13:00 +01:00
Pierre Noël
e230827335 fix dynamic callback 2022-01-19 17:12:59 +01:00
Pierre Noël
5cdd3f0044 fix typo 2022-01-19 17:12:59 +01:00
Pierre Noël
c4fee8e676 use strapi.log.info + replace uuid by crypto + remove dead code 2022-01-19 17:12:57 +01:00
Pierre Noël
da9b064536 add session middleware + remove authentication using url param access_token 2022-01-19 17:10:41 +01:00
Alexandre BODIN
fb4e03fefb
Merge pull request #12245 from strapi/dependabot/npm_and_yarn/testing-library/jest-dom-5.16.1 
Bump @testing-library/jest-dom from 5.14.1 to 5.16.1
 2022-01-19 15:29:56 +01:00
Alexandre Bodin
4c85a5f561 Fix new lines 2022-01-19 14:54:58 +01:00
Alexandre BODIN
1cdac46604
Merge pull request #12043 from sunnysonx/fix/plugin-generator 
Create CTs, middlewares, policies folders during plugin generation
 2022-01-19 13:53:44 +01:00
dependabot[bot]
6ba385ba42
Bump @testing-library/jest-dom from 5.14.1 to 5.16.1 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.14.1 to 5.16.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.14.1...v5.16.1)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-19 12:18:23 +00:00
Alexandre BODIN
dbd2604fab
Merge pull request #12240 from strapi/dependabot/npm_and_yarn/glob-7.2.0 
Bump glob from 7.1.6 to 7.2.0
 2022-01-19 13:16:47 +01:00
Alexandre BODIN
ca57d3c12e
Merge pull request #12186 from MuriloKakazu/master 
chore: add missing pt-BR translations
 2022-01-19 13:16:02 +01:00
Alexandre BODIN
3def0013f6
Merge branch 'master' into fix/plugin-generator 2022-01-19 13:15:48 +01:00
Alexandre BODIN
cb0d13853c
Merge pull request #12169 from davidroseboom/patch-1 
Update nl.json
 2022-01-19 13:15:16 +01:00
kerimabdy
9934f7c1c7
Merge branch 'master' into add-tk-iso-code 2022-01-19 16:08:44 +05:00
Alexandre BODIN
7135548cc5
Merge pull request #12141 from OleksiiKachan/fix-ukrainian-locale 
fix translations for Ukrainian
 2022-01-19 11:55:12 +01:00
Alexandre BODIN
ba882a8075
Merge pull request #12135 from dobosmarton/hu-translations 
feat: Hungarian admin translations
 2022-01-19 11:54:54 +01:00
Alexandre BODIN
d7142ee74f
Merge pull request #12056 from SergeiMeza/meza/update-japanese-translations 
Update Admin Japanese translations
 2022-01-19 11:23:29 +01:00