yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-10 15:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 107 Branches 503 Tags
Commit Graph

2920 Commits

Author SHA1 Message Date
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
Alexandre BODIN
be89f1505b
Merge pull request #11924 from duncanhsieh/master 
Translate en.json into traditional Chinese.
 2021-12-20 17:40:26 +01:00
Alexandre BODIN
b6bc048bb0
Merge pull request #11954 from strapi/serve-admin 
Build admin only when necessary and serve it from the admin package
 2021-12-20 17:29:33 +01:00
soupette
1db862161b Use script to build the admin when developing 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-20 15:51:19 +01:00
soupette
584347e4bb Use default build 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-20 14:56:06 +01:00
soupette
3fae2a3fca Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-20 14:02:31 +01:00
MuxauJl
195fa88cfa fix 2021-12-20 17:45:49 +07:00
Maxime Marty-Dessus
d9ec72af44 update welcome message 2021-12-18 23:35:11 +01:00
Maxime Marty-Dessus
b935c3b7f9 fix some mistakes 2021-12-18 23:19:24 +01:00
Maxime Marty-Dessus
4a8e47ddf3 fix plural logic 2021-12-18 20:50:15 +01:00
Maxime Marty-Dessus
c7eaa37edd remove duplicate in en.json 2021-12-18 20:46:55 +01:00
Maxime Marty-Dessus
aabeca7ece add all missing entries to fr.json 2021-12-18 20:46:51 +01:00
Duncan Hsieh
8c3c28a5af Translate en.json into traditional Chinese. 2021-12-16 00:40:28 +08:00
Abdón Rodríguez Davila
7accd9908f
Merge branch 'master' into created-by 2021-12-15 17:29:13 +01:00
Abdón Rodríguez Davila
b990a4227b Update snapshot 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2021-12-15 17:28:44 +01:00
soupette
1618d2313f Fixes #11908 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-15 15:32:42 +01:00
Abdón Rodríguez Davila
bedddcedae
Merge branch 'master' into created-by 2021-12-15 11:35:35 +01:00
Alexandre BODIN
687eb623e9
Merge pull request #10968 from strapi/chore/test-config 
Rework test config to get a better monorepo experience
 2021-12-14 17:34:00 +01:00
Alexandre BODIN
6c24b61389
Merge pull request #11901 from strapi/use-asset-module 
Replace file-loader and url-loader with asset modules
 2021-12-14 17:32:46 +01:00
Fabien del Carmen
66ca7b2f4f
Merge branch 'master' into chore/test-config 2021-12-14 16:32:01 +01:00
Alexandre BODIN
8ae6fd5ae7
Merge branch 'master' into chore/test-config 2021-12-14 15:56:27 +01:00
soupette
d1b68991f1 Use asset module 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-14 11:46:47 +01:00
soupette
6e7d614bb0 Merge branch 'master' of github.com:strapi/strapi into fix/11845 2021-12-14 10:29:54 +01:00
Alexandre BODIN
da73164fbc
Merge pull request #11734 from iicdii/translation-ko 
Update ko translation, add missing key
 2021-12-14 10:14:09 +01:00
soupette
cf05f9b0ef Fix CM model redirection 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-14 10:12:40 +01:00
soupette
ef3e693dfc Fixes #11845 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-14 10:08:58 +01:00
oscarsandberg
803cb978e2 add tests for cellvalue component 2021-12-13 18:58:30 +01:00
oscarsandberg
6271be6cf3 show all decimals for numbers of typ floats or decimals 2021-12-13 18:57:15 +01:00
Alexandre BODIN
11d4ed8527
Merge pull request #11724 from strapi/chore/fingerprint-fix 
Added fingerprint prefix in order to match the one on strapi website
 2021-12-13 14:32:14 +01:00
Alexandre BODIN
8a8a51b620
Merge pull request #11819 from jsprds/jsprds-dutch-translation-fix 
Update nl.json
 2021-12-13 14:22:28 +01:00
ivanThePleasant
c05a2ba7c9
Merge branch 'master' into chore/fingerprint-fix 2021-12-13 12:24:43 +00:00