yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,252 Commits 111 Branches 487 Tags
Commit Graph

3386 Commits

Author SHA1 Message Date
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
Vincent
fe335a2bb3
Guided tour/last step fixes (#12334) 
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2022-01-28 13:15:28 +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
vincentbpro
ef707a0543 refactor(guided-tour): improved folder structure 2022-01-27 17:32:58 +01:00
vincentbpro
6b07c0659f test(guided-tour): updated snapshots 2022-01-27 17:13:35 +01:00
vincentbpro
accda4c6b9 fix(guided-tour): text fixes 2022-01-27 17:08:49 +01:00
vincentbpro
34a0baa407 fix(guided-tour): text changes api token success modal 2022-01-27 16:39:37 +01:00
ronronscelestes
32a9341b7b feat(guided-tour): success api token wording wip 2022-01-27 15:40:34 +01:00
ronronscelestes
0408b4f3d0 fix(guided-tour): skip and 3 simple steps 2022-01-27 14:46:41 +01:00
Vincent
21668ea005
feat(guidedTour): handle cta targets + various fixes (#12317) 
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2022-01-27 14:33:56 +01:00
Vincent
0054e02363
fix(guidedTour): trigger modal only at collection-type creation (#12318) 
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2022-01-27 14:33:09 +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
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
ronronscelestes
cafdf8aa2b
(Feature: Guided tour) Modal + Stepper (#12262) 
Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>
 2022-01-26 16:26:00 +01: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
ronronscelestes
a46a96695d
(Feature: Guided tour) Skip (#12294) 
Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>
 2022-01-26 10:37:07 +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
56407e83c5
Merge branch 'master' into fix/enable-session-middleware 2022-01-25 11:07:08 +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
p_0g_8mm3_
dc95212332
fix import order 2022-01-24 21:20:34 +01:00
p_0g_8mm3_
f05d07e685
Make component category translatable 2022-01-24 21:12:57 +01:00
Pierre Noël
46a4dd01b0
Merge branch 'master' into fix/enable-session-middleware 2022-01-24 17:20:04 +01:00
Vincent
0d236d8906
Guided tour/trigger modal (#12268) 
Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>
 2022-01-24 17:15:50 +01:00
ronronscelestes
b89c9047a3 feedback fix 2022-01-24 16:51:03 +01:00
vincentbpro
f59a779ab5 test(translations): prevent use of .singular/.plural syntax 2022-01-24 15:58:56 +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
vincentbpro
846a7fb90c test(translations): updated plural syntax test 2022-01-24 15:41:04 +01:00
vincentbpro
c4e75eacb6 fix(translations): removed unused key 2022-01-24 15:18:23 +01:00
vincentbpro
21ef62a509 fix(translations): removed unused key 2022-01-24 15:02:52 +01:00
vincentbpro
5a9e7fb84c fix(translations): removed unused key 2022-01-24 15:00:47 +01:00
vincentbpro
ddf1199620 fix(translations): removed unused key 2022-01-24 14:55:25 +01:00
vincentbpro
cad2571e3f fix(translations): removed old plural syntax 2022-01-24 14:51:44 +01:00
vincentbpro
b9cd4e3696 test(translations): prevent use of .singular/.plural syntax 2022-01-24 14:46:05 +01:00
ronronscelestes
d9259f9971 feat: added required UI to JSON input 2022-01-24 12:34:13 +01: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