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

514 Commits

Author SHA1 Message Date
Convly
4fa2804f35 Merge branch 'master' into features/typescript 2022-04-15 15:47:16 +02:00
soupette
9a052ee876 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-13 17:15:16 +02:00
Alexandre Bodin
3f204a0a48 v4.1.8 2022-04-13 16:45:31 +02:00
Gustav Hansen
084fbe00a5
Merge pull request #12962 from pr0gr8mm3r/master 
Add missing german translations
 2022-04-07 15:00:37 +02:00
Convly
f7a20effb1 Fix public directories 2022-04-04 17:12:47 +02:00
soupette
ea4b16b036 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-04 12:02:52 +02:00
Convly
84d106e7f8 Use new dirs (app/dist) 2022-04-04 11:46:22 +02:00
soupette
867cf185d7 Remove tsconfig.json in plugins 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-04 11:26:34 +02:00
soupette
58f2e7536d Add webpack config for TS and created tsconfig.json files for all plugins to enable TS in the admin 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-04 11:26:33 +02:00
p_0g_8mm3_
930c07375c
Fix wording on upload more button 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2022-04-03 23:07:03 +02:00
Alexandre Bodin
b1df5a6067 Merge branch 'releases/4.1.7' 2022-04-01 09:55:43 +02:00
Gustav Hansen
260a68d8e6
Merge pull request #13018 from strapi/fix/upload-action-options 
Fix actionOptions not taking into account by the upload provider
 2022-03-31 18:02:22 +02:00
Alexandre Bodin
1699aac151 v4.1.7 2022-03-31 17:53:39 +02:00
Pierre Noël
f245e9dbe2 fix upload bootstrap unit test 2022-03-31 16:00:05 +02:00
Pierre Noël
dd36d43b52 change wording didnt to doesnt 2022-03-31 11:01:40 +02:00
Pierre Noël
7ef77c8481 refactor upload bootstrap 2022-03-31 11:01:39 +02:00
Pierre Noël
8e9c7285dd implement uploadStream wrapping for actionOptions 2022-03-31 11:01:39 +02:00
Alexandre Bodin
f25774168c v4.1.6 2022-03-30 15:34:12 +02:00
Gustav Hansen
6638aeedce EditViewDataManagerProvider: Handle API errors independently from yup 2022-03-28 12:41:32 +02:00
pr0gr8mm3r
5b1d214240 translate upload plugin to german 2022-03-26 00:00:44 +01:00
Pierre Noël
cf33ce0b63
Merge pull request #12534 from strapi/content-68/fix-public-path 
Move public path config to server.js
 2022-03-25 16:35:42 +01:00
Alexandre Bodin
5cbb60ce4b Merge branch 'master' into releases/4.2.0 2022-03-24 11:11:00 +01:00
cyril lopez
7e105cc784
Merge pull request #12922 from strapi/fix/ml-audio-type 
ML: Add audio type to asset filters
 2022-03-23 18:18:19 +01:00
Vincent
9afe470cbf
Merge pull request #12921 from strapi/feat/translations-cleanup 
Feat/translations cleanup
 2022-03-23 17:02:12 +01:00
Gustav Hansen
a26788bcef ML: Add audio type to filters 2022-03-23 15:38:04 +01:00
Gustav Hansen
278f401545
Merge pull request #12877 from strapi/fix/upload-crop-size 
EditAssetDialog: Use original image as source for cropping
 2022-03-23 14:41:29 +01:00
vincentbpro
6d7071bc5f Merge branch 'master' into feat/translations-cleanup 2022-03-23 13:28:47 +01:00
Gustav Hansen
c3c2db1a53 EditAssetDialog: Improve hook variable naming 2022-03-22 08:46:01 +01:00
Nick Frasser
04e274141b
Update upload e2e test to check for provider 2022-03-21 23:49:27 -04:00
Nick Frasser
8747947cf3
Ensure provider is always assigned on uploaded file 
Previously the uploaded file data was assigned a provider in the conditional block that calculated dimensions on supported images. This caused the provider to be stored as null in the database for some image uploads such as SVG. The provider property is now assigned unconditionally
 2022-03-21 23:22:47 -04:00
Pierre Noël
944da72dee Merge branch 'master' into content-68/fix-public-path 2022-03-21 16:20:34 +01:00
Gustav Hansen
f8582f2916 EditAssetDialog: Use original image as source for cropping 2022-03-18 16:00:52 +01:00
Gustav Hansen
71d2c70b62 formatDuration: add tests 2022-03-17 11:32:26 +01:00
Gustav Hansen
26a2786b84 ML: Fix format of video duration 2022-03-17 11:32:26 +01:00
Pierre Noël
22928aa92b Merge branch 'master' into content-68/fix-public-path 2022-03-16 14:54:14 +01:00
Alexandre Bodin
f1859f0375 v4.1.5 2022-03-16 12:18:10 +01:00
Alexandre Bodin
3a0fd5ca03 Merge branch 'master' into releases/4.2.0 2022-03-16 11:26:42 +01:00
Alexandre Bodin
01a565aeb6 v4.1.4 2022-03-16 11:22:49 +01:00
Alexandre BODIN
74949f6747
Merge pull request #12792 from strapi/CONTENT-50/ml-upload-copy 
Media Library: improve microcopy
 2022-03-16 11:09:29 +01:00
Pierre Noël
f3da9d8d2d Merge branch 'master' into content-68/fix-public-path 2022-03-15 10:57:16 +01:00
vincentbpro
643ad2d97d reorder translation files 2022-03-15 10:27:05 +01:00
vincentbpro
e67067c584 merged duplicated tranlations using the interactive script 2022-03-15 10:25:43 +01:00
ronronscelestes
fb316d3824 Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-10 18:20:50 +01:00
ronronscelestes
524067fc44 Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-10 15:11:44 +01:00
HichamELBSI
e89098da42 Bump DS alpha.77 (no breaking changes) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-03-10 15:06:30 +01:00
Gustav Hansen
bc4ab36d08 Media Library: improve microcopy 2022-03-09 13:24:03 +01:00
Alexandre Bodin
8549f5aca3 v4.1.3 2022-03-08 19:28:44 +01:00
Pierre Noël
d48302fec0 fix unit test 2022-03-03 14:56:53 +01:00
Pierre Noël
1d7ce86506 Merge branch 'master' into content-68/fix-public-path 2022-03-02 16:15:19 +01:00
Alexandre Bodin
6f72c38052 v4.1.2 2022-03-02 16:01:32 +01:00