yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 119 Branches 507 Tags
Commit Graph

3850 Commits

Author SHA1 Message Date
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
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
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
soupette
61fe669fb6 Specify minimum node version to be 12.22.0 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 11:55:52 +01:00
soupette
6b89565995 Upgrade babel dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2022-01-03 11:46:15 +01:00
Robin Louis van Komen
57a70a0fb0 update existing translations 2022-01-02 16:40:22 +01:00
oscarsandberg
c2b2e1b4cf add tests for utils function 2022-01-01 20:34:32 +01:00
oscarsandberg
32a70b88fd move function to utils folder 2022-01-01 20:34:08 +01:00
p_0g_8mm3_
a4e2a5fbac make left menu header title and workplace string resources 2021-12-31 14:44:35 +01:00
SergeiMeza
acc12f33a9 Update Admin Japanese translations 2021-12-31 08:02:48 +09:00
HichamELBSI
891b8b98eb Add confirm alert on close modal (upload) & bump DS version 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-12-30 14:58:41 +01:00
cyril lopez
7b32c05f6c
Merge branch 'master' into fix/italic-style-is-ignored 2021-12-30 12:21:14 +01:00
cyril lopez
6d99de01a8
Merge branch 'master' into fix/italic-style-is-ignored 2021-12-30 12:17:36 +01:00
Vincent
1b276b6dc7
Feature(GuidedTour)/ Init helper plugin + admin (#12047) 
* 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

Co-authored-by: ronronscelestes <ronronscelestes@users.noreply.github.com>
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2021-12-30 11:41:53 +01:00
soupette
af2807222e Fixes #12045 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-30 10:53:49 +01:00
soupette
42c56d9e63 Fix CM no content type view 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-30 09:11:31 +01:00
Tano Abeleyra
6bbc5d84c4 Update admin Spanish translations 2021-12-27 00:01:08 +01:00
harimkims
d2a57383bc Fix italic style is ignored in preview mode 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-26 19:49:25 +09:00
Alexandre Bodin
fd656a4769 v4.0.2 2021-12-22 16:04:10 +01:00
soupette
d14e4a242e Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-22 15:54:26 +01:00
soupette
0305e2c16c Fixes #11991 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-22 15:32:26 +01:00
Alexandre Bodin
e2cd01e8c6 v4.0.1 2021-12-22 10:43:38 +01:00
tillschweneker
ac0c306a0b [FIX] respect custom ENV_PATH when setting API_TOKEN_SALT 2021-12-22 10:08:47 +01:00
Alexandre BODIN
2be212cd6f
Merge pull request #11969 from iicdii/fix/api-token-popluate 
Fix relations are not populated when API key is read-only
 2021-12-22 09:09:02 +01:00
harimkims
a926999b29 Fix relations are not populated if API key is read-only 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-21 22:37:43 +09:00
Maxime Marty-Dessus
b6b7ff702d update translation in en.json 2021-12-21 11:05:20 +01:00
Maxime Marty-Dessus
f7c47785ba
Merge branch 'strapi:master' into master 2021-12-20 23:52:13 +01:00