yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 10:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,748 Commits 114 Branches 488 Tags
Commit Graph

19748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
eb7aaf9c7d
Merge pull request #12025 from iicdii/fix/italic-style-is-ignored 
Fix issue that italic style is ignored in preview mode on markdown editor
 2021-12-30 13:02:31 +01:00
cyril lopez
7b32c05f6c
Merge branch 'master' into fix/italic-style-is-ignored 2021-12-30 12:21:14 +01:00
cyril lopez
9e87e92e8b
Merge pull request #12050 from strapi/fix/12045 
Fixes #12045
 2021-12-30 12:20:51 +01:00
cyril lopez
6d99de01a8
Merge branch 'master' into fix/italic-style-is-ignored 2021-12-30 12:17:36 +01:00
soupette
af2807222e Fixes #12045 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-30 10:53:49 +01:00
cyril lopez
b6c4c044ca
Merge pull request #12049 from strapi/update-plugin-generators 
Update plugin generators for the admin files
 2021-12-30 10:14:55 +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
soupette
349d384a7d Fix plugin generator 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-30 08:55:34 +01:00
cyril lopez
576a603ed6
Merge pull request #12012 from strapi/always-clear-cache-folder 
Always remove the build and cache folder when running the build command
 2021-12-29 15:25:43 +01:00
cyril lopez
0550c7b7a1
Merge branch 'master' into always-clear-cache-folder 2021-12-29 14:45:34 +01:00
cyril lopez
4173a23236
Merge branch 'master' into fix/italic-style-is-ignored 2021-12-29 10:12:58 +01:00
cyril lopez
d12900c0be
Merge pull request #12036 from strapi/fix/12034 
Fix wrong axios instance in email plugin
 2021-12-29 10:12:13 +01:00
cyril lopez
ce3b715a39
Merge branch 'master' into fix/12034 2021-12-29 09:26:58 +01:00
Ajit Panigrahi
d231706baa
Added logo for GitHub dark mode (#12024) 
* Added logo for GitHub dark mode

* Fixed duplicate logos

Original syntax by GitHub does not work yet and has undocumented behaviour.
Instead of src, they are check href attribute for themin.
Source: https://github.community/t/support-theme-context-for-images-in-light-vs-dark-mode/147981/84

* Updated for center layout

This is possible again since we can apply the hash on anchor tag, which is not limited to Markdown.

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
 2021-12-28 10:25:30 -07:00
soupette
cf2f87cbb8 Fix #12034 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-28 14:09:10 +01:00
ELABBASSI Hicham
c58e169a6b
Merge pull request #11989 from strapi/fix/upload-file-info-form 
Fix upload file info form
 2021-12-28 11:50:24 +01:00
HichamELBSI
d4cf3ae8ee Fix upload file info form 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-12-27 10:50:00 +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
soupette
540a27999b Always remove the build and cache folder when running the build command 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-24 10:23:39 +01:00
cyril lopez
e5ee7f05ac
Merge pull request #11997 from strapi/enhancement/remove-build-from-watches 
Remove the build directory from the watched files list
 2021-12-23 10:18:28 +01:00
Convly
1fdfa866dc Remove the build directory from the watched files list 2021-12-22 16:55:32 +01:00
Alexandre Bodin
fd656a4769 v4.0.2 v4.0.2 2021-12-22 16:04:10 +01:00
Alexandre BODIN
1bbe394df9
Merge pull request #11994 from strapi/fix/11991 
Fix menu link without search in CM
 2021-12-22 15:58:41 +01:00
soupette
d14e4a242e Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-22 15:54:26 +01:00
cyril lopez
2b8f90593e
Merge branch 'master' into fix/11991 2021-12-22 15:42:28 +01:00
soupette
0305e2c16c Fixes #11991 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-22 15:32:26 +01:00
Alexandre BODIN
4e7c3db5a4
Merge pull request #11967 from abolkog/fix/policy-generator-template 
Fix generator policy template
 2021-12-22 15:30:02 +01:00
Alexandre BODIN
d9b540aaed
Merge pull request #11986 from strapi/fix/serve-admin 
Remove build from install script
 2021-12-22 15:05:03 +01:00
Alexandre BODIN
87491208a4
Merge pull request #11981 from iicdii/fix/unable-to-delete-image 
Fix unable to delete an image from the media-library
 2021-12-22 11:57:59 +01:00
soupette
e8aa36d3f7 Remove build from app install 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-22 11:29:12 +01:00
Alexandre Bodin
e2cd01e8c6 v4.0.1 v4.0.1 2021-12-22 10:43:38 +01:00
Kim, Harim
8b862936e4
Merge branch 'master' into fix/unable-to-delete-image 2021-12-22 17:58:58 +09:00
harimkims
32e4aec852 Refactor code to run the query only when necessary 2021-12-22 17:58:22 +09:00
Alexandre BODIN
7e1ef71d9b
Merge pull request #11973 from strapi/watch-mode 
Remove admin files from watched files
 2021-12-22 09:11:15 +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
Alexandre BODIN
11b078bd55
Merge pull request #11944 from maximeMD/master 
Add missing french translations
 2021-12-22 09:03:53 +01:00
harimkims
84130ab541 Fix unable to delete an image from the media-library 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-22 09:35:00 +09:00
Kim, Harim
ea95e740c1
Merge branch 'master' into fix/api-token-popluate 2021-12-22 07:15:13 +09:00
soupette
d24fe52a89 Remove admin files from watched files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-12-21 17:22:10 +01:00
Maxime Marty-Dessus
ae916f95e4
Merge branch 'master' into master 2021-12-21 14:42:40 +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
Kim, Harim
93de45cc2e
Add test for Content API filter by locale (#11961) 
* Fix unable to filter by locale

Signed-off-by: harimkims <harimkims@gmail.com>

* Fix failed e2e test

* Revert modifying decorator test, Add locale filter key

* Revert supporting both locale, _locale format

* Replace _locale with locale

* Replace _locale params with locale in test

* Rename testing for default locale filtering

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2021-12-21 13:43:25 +01:00
Khalid Elshafie
9b1e85fd2f
Fix generator policy template 2021-12-21 22:10:24 +11:00
Kim, Harim
bd0aa9e9f5
Fix unable to reset password in GraphQL mutation (#11964) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2021-12-21 11:45:18 +01: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
4497124c87
Merge pull request #11933 from meduzen/patch-1 
Fix English grammar in test files
 2021-12-20 17:41:17 +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
ELABBASSI Hicham
04299a1bdf
Merge pull request #11950 from SlavMAK/fix-display-error-in-admin-panel 
fix error message in admin panel
 2021-12-20 17:16:11 +01:00