yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 21:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,985 Commits 123 Branches 496 Tags
Commit Graph

1559 Commits

Author SHA1 Message Date
ronronscelestes
6016485f3c merge bis bis + fix merge conflicts 2022-01-28 15:32:19 +01:00
Convly
5b48053946 v4.0.6 2022-01-28 15:08:27 +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
Convly
4fc8e83eb8 Fix redirect path for sso & fix customEERoute 2022-01-28 14:22:14 +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
bb222c995d
Required-field: Bump ds 74 (#12335) 2022-01-28 11:47:47 +01: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
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
Pierre Noël
46a4dd01b0
Merge branch 'master' into fix/enable-session-middleware 2022-01-24 17:20:04 +01:00
ronronscelestes
b89c9047a3 feedback fix 2022-01-24 16:51:03 +01:00
ronronscelestes
d9259f9971 feat: added required UI to JSON input 2022-01-24 12:34:13 +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
Pierre Noël
4d51e8131c
Merge branch 'master' into fix/enable-session-middleware 2022-01-21 14:01:12 +01:00
Alexandre BODIN
45020eee06 v4.0.5 2022-01-19 18:44:22 +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
ca57d3c12e
Merge pull request #12186 from MuriloKakazu/master 
chore: add missing pt-BR translations
 2022-01-19 13:16:02 +01:00
Alexandre BODIN
cb0d13853c
Merge pull request #12169 from davidroseboom/patch-1 
Update nl.json
 2022-01-19 13:15:16 +01: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
Alexandre BODIN
ac58311b1b
Merge pull request #12033 from tanoabeleyra/es-translations 
Update Spanish translations
 2022-01-19 11:18:24 +01:00
Alexandre BODIN
d3be9e03d4
Merge pull request #12119 from duncanhsieh/master 
Add missing translations for traditional Chinese
 2022-01-19 10:48:36 +01:00
Alexandre BODIN
5cbbb5bdaa
Merge pull request #12071 from VK-Media/update-danish-translations 
Update danish translations
 2022-01-19 10:45:53 +01:00
Alexandre BODIN
cc9a1b7e01
Merge pull request #11983 from tillschweneker/fix-env_path-variable 
[FIX] respect custom ENV_PATH
 2022-01-19 10:25:12 +01:00
HichamELBSI
a158fd9b00 Add document name 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-18 16:52:10 +01:00
Oleksii Kachan
258133a545
Merge branch 'master' into fix-ukrainian-locale 2022-01-18 09:27:12 -05:00
Murilo Kakazu
b7425ef419
Merge branch 'master' into master 2022-01-17 17:58:10 -03:00
Vincent
b606178332
Interface language usage metrics (#12107) 
* feat: sending didChangeInterfaceLanguage event

* fix: registered user model lifecycle hook to send  event

* test: added tests for user and metrics services

* fix: sending event on user delete

* fix: avoid sending event when language is not updated
 2022-01-17 17:45:26 +01:00
David
70628ce082
Merge branch 'master' into patch-1 2022-01-17 16:34:25 +01:00
Márton Dobos
60a00ef412
Merge branch 'master' into hu-translations 2022-01-17 15:50:32 +01:00
harimkims
31259dbf4a Remove unnecessary bracket in the end 2022-01-17 14:13:33 +01:00
Kim, Harim
9e8655716d Refactor code 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2022-01-17 14:13:33 +01:00
harimkims
de69873606 Fix that returns an empty object when the admin user value is null 
Signed-off-by: harimkims <harimkims@gmail.com>
 2022-01-17 14:13:33 +01:00
harimkims
2ff2ba860e Fix hasMany admin users making app crash 
Signed-off-by: harimkims <harimkims@gmail.com>
 2022-01-17 14:13:33 +01:00
soupette
7bf9f819e0 Fixes #11936 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-17 12:06:15 +01:00
Murilo Kakazu
a17bd28ac2 fix webhook header translations 2022-01-12 19:47:59 -03:00
Murilo Kakazu
7fea78ca07 fix typo 2022-01-12 19:43:13 -03:00
Murilo Kakazu
77c5c1daae add some more missing translations 2022-01-12 19:24:36 -03:00
Murilo Kakazu
da1064656f fix typo 2022-01-12 19:15:06 -03:00
Murilo Kakazu
83bd7f86e3 chore: add missing pt-BR translations 2022-01-12 19:08:17 -03:00
Jean-Sébastien Herbaux
ce09d38972
Enable to create/trigger webhooks with no events (#12174) 
Co-authored-by: cyril lopez <cyril@strapi.io>
 2022-01-12 16:26:06 +01:00
cyril lopez
d0d630de08
Merge branch 'master' into fix/12163 2022-01-12 13:22:50 +01:00
soupette
1763c66e23 Add comments 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-11 17:27:53 +01:00
Oleksii Kachan
00280c4ebe
Merge branch 'master' into fix-ukrainian-locale 2022-01-11 11:18:11 -05:00