yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 12:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 117 Branches 489 Tags
Commit Graph

5123 Commits

Author SHA1 Message Date
Alexandre Bodin
d81919ac22 v4.0.4 2022-01-10 09:05:07 -08:00
Pierre Noël
0e39079840
Merge branch 'master' into colors-fix 2022-01-10 16:48:04 +01:00
soupette
29d48f24a3 Upgrade storybook dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-10 16:24:57 +01:00
cyril lopez
026078566a
Merge branch 'master' into colors-fix 2022-01-10 14:45:51 +01:00
HichamELBSI
54c80d9a87 Some UI fix for the WYSIWYG 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-10 12:46:02 +01:00
Convly
2670d37ddc Fix tests & handle scalars shortcuts 2022-01-10 12:35:08 +01:00
Pierre Noël
0dba1fc644 allow components in the list view 2022-01-10 12:06:36 +01:00
cyril lopez
a666e0a4b4
Prevent saving content type when dynamic zone does not have components. (#12123) 
* Add min validation for dynamiczone

Signed-off-by: soupette <cyril@strapi.io>

* Add toast when schema is not valid

Signed-off-by: soupette <cyril@strapi.io>

* Fix PR feedback

Signed-off-by: soupette <cyril@strapi.io>
 2022-01-10 11:55:58 +01:00
Convly
04ec37e36e Merge branch 'master' of github.com:strapi/strapi into sanitize-filters 2022-01-10 10:59:17 +01:00
EzraEn
7e9c449efa
Merge branch 'master' into colors-fix 2022-01-10 17:03:41 +08:00
EzraEn
2215d58161 fix: Update cli-table3 which uses chalk vs colors 2022-01-10 08:13:34 +00:00
Oleksii Kachan
ae00fd126d
fix translations for Ukrainian 2022-01-09 10:24:18 -05:00
Marton Dobos
abb441c33a feat: hungarian translations 2022-01-08 13:09:20 +01:00
cyril lopez
c56bedea43
Merge branch 'master' into cm/add-dz-description 2022-01-07 09:50:25 +01:00
Convly
81fff98c31 Remove dynamic zone filters 2022-01-06 16:35:44 +01:00
Convly
3eafe1c6e1 Enhance filters sanitize 2022-01-06 16:19:27 +01:00
HichamELBSI
ef2e9a27e9 Fix intlDescription 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-06 11:59:20 +01:00
p_0g_8mm3_
b427157c9b
Merge branch 'master' into make-leftmenu-header-translateable 2022-01-06 11:29:28 +01:00
HichamELBSI
f4964ef390 Add DZ description 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-06 10:24:57 +01:00
Duncan Hsieh
35f470d7e2 Keep up-to-date 2022-01-06 17:19:53 +08:00
Vincent
81e1fb2de9
Guided tour/stepper (#12082) 
* feat: added guided tour context, hook and provider to helper-plugin

* feat(guided-tour): using helpers in the admin + init reducer

Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>

* feedback fixes

* created data structure for guided tour state and content

Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>

* removed closed leaf key from initialState

* init guided tour home component

* feedback fix fontWeight prop

* Stepper, StepNumber, StepLine, Step

* wip adding Stepper to homepage

* WIP: homepage stepper

Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>

* fixed grid aligment StepHomepage

* feat: added homepage stepper

Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>

* changed StepLine color if isNotDone + added useGuidedTour mock and updated snapshort for homepage tests

* removed guided tour component from homepage until we add local storage and user role detection in the next PR

* removed changed from homepage snapshots

Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>
 2022-01-05 17:45:43 +01:00
ronronscelestes
8a27d6f2c3 Merge branch 'master' of https://github.com/strapi/strapi into fix/richtext-required-ui 2022-01-05 17:28:27 +01:00
ronronscelestes
01190a00b5 added ui when richtext is required 2022-01-05 17:26:14 +01:00
Alexandre Bodin
48893ae3fc v4.0.3 2022-01-05 16:50:20 +01:00
Felix Fang
5a0aa6e856
Merge branch 'master' into master 2022-01-05 21:34:14 +08:00
Felix
5ca45b085f feat: fix typo & add missing translations 2022-01-05 21:17:33 +08:00
ronronscelestes
194c39aeb2 fixed uid required ui 2022-01-05 13:37:35 +01:00
ronronscelestes
29ca7bfed3 updated snapshots 2022-01-05 12:12:36 +01:00
ronronscelestes
17f594e54f required field ui for profile, users creation/edition, api tokens and webhooks 2022-01-05 12:09:56 +01:00
Alexandre BODIN
0c14a06979
Merge pull request #11890 from oscarsandberg/fix/show-correct-number-of-decimals-content-manager 
Fix: show correct number of decimals in content manager
 2022-01-05 09:15:50 +01:00
Alexandre BODIN
b56df832c6
Merge pull request #11995 from nemo0/change-unknow-to-unknown 
Fix typo
 2022-01-05 09:15:24 +01:00
Alexandre BODIN
41200690c3
Merge pull request #12078 from strapi/upgrade-webpack-config 
Upgrade webpack config and related dependencies
 2022-01-05 09:14:54 +01:00
soupette
b234d91c4f Merge branch 'master' of github.com:strapi/strapi into upgrade-webpack-config 2022-01-04 15:30:26 +01:00
soupette
d4ad998055 Fixes #12000 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-04 15:30:17 +01:00
Alex Gao
8bb44ceee9 Merge remote-tracking branch 'upstream/master' 2022-01-04 22:01:00 +08:00
Alex Gao
497c542256 Merge remote-tracking branch 'upstream/master' 2022-01-04 21:06:25 +08:00
cyril lopez
7ee5d440e1
Merge branch 'master' into fix/12089 2022-01-04 13:57:31 +01:00
HichamELBSI
2550c9c643 Fix firefox drag n drop 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-04 10:09:48 +01:00
soupette
b768b327e3 Fixes #12089 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-04 09:52:27 +01:00
smoothdvd
fd4ef168ea
Merge branch 'strapi:master' into master 2022-01-04 15:50:47 +08:00
Alex Gao
86ac7f99a9 Update Admin Chinese (Simplified) translations 2022-01-04 15:17:18 +08:00
HichamELBSI
675ccf6824 Fix logout on Safari 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-01-03 17:15:10 +01:00
ronronscelestes
ccd92c08ad
(Feature-GuidedTour)/ State and content structure (#12054) 
* feat: added guided tour context, hook and provider to helper-plugin

* feat(guided-tour): using helpers in the admin + init reducer

Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>

* feedback fixes

* created data structure for guided tour state and content

Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>

* removed closed leaf key from initialState

* init guided tour home component

* feedback fix fontWeight prop

Co-authored-by: vincentbpro <89356961+vincentbpro@users.noreply.github.com>
Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>
Co-authored-by: Vincent <vincentbpro@users.noreply.github.com>
 2022-01-03 16:21:51 +01:00
p_0g_8mm3_
3f3edd27ae fix displaying wrong translations, rename translations 2022-01-03 16:16:40 +01:00
DMehaffy
489aa6804c
Merge branch 'master' into fix/show-correct-number-of-decimals-content-manager 2022-01-03 06:55:38 -07:00
derrickmehaffy
4dbb64e8a2 change default policies error 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-01-03 06:25:18 -07:00
derrickmehaffy
9fd85b9bfd Add PolicyError error type for use in policies 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-01-03 06:16:34 -07:00
soupette
295b72243c Add design system to webpack alias 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 12:47:18 +01:00
soupette
64d2436cd7 Remove unneeded depenendencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 12:42:48 +01:00
soupette
002bfb57b6 Upgrade dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 12:23:28 +01:00