yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 05:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,014 Commits 123 Branches 496 Tags
Commit Graph

23014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
03aa29e527 Fix merge issue 2022-08-11 10:20:50 +02:00
Alexandre Bodin
35c3ea6eec Update version 2022-08-11 10:20:50 +02:00
Alexandre Bodin
b4572b7fb5 Refactor some multi class files 2022-08-11 10:20:50 +02:00
Alexandre Bodin
17866010b7 Apply no promise return 2022-08-11 10:20:50 +02:00
Alexandre Bodin
89d77ced5d Update upload plugin 2022-08-11 10:20:49 +02:00
Alexandre Bodin
92955d19f9 Frontend updates 2022-08-11 10:20:49 +02:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
Alexandre Bodin
0ae14c06cb 1st fix pass 2022-08-11 10:20:48 +02:00
Alexandre Bodin
75d83a0c34 Update eslint back 2022-08-11 10:20:48 +02:00
Alexandre Bodin
b9d0786eff Use @strapi/eslint-config 2022-08-11 10:20:48 +02:00
Alexandre Bodin
28a2a00db8 v4.3.4 v4.3.4 2022-08-11 10:17:34 +02:00
Alexandre BODIN
b0da408fe8
Merge pull request #14072 from strapi/fix/lost-code-merge 
Put missing code back
 2022-08-11 10:15:31 +02:00
Alexandre Bodin
dd357e63e6 Put missing code back 2022-08-11 10:04:46 +02:00
Alexandre Bodin
4d60bfdeee v4.3.3 v4.3.3 2022-08-10 14:08:54 +02:00
Alexandre BODIN
84409c289f
Merge pull request #13611 from alexdupre/cors-fix 
Fix CORS response headers.
 2022-08-10 14:06:55 +02:00
Alex Dupre
556c0e789d Fix CORS response headers. 
The combination of `Access-Control-Allow-Credentials: true` and
`Access-Control-Allow-Origin: *` is illegal for CORS specifications:
https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
 2022-08-10 11:53:22 +02:00
Alexandre Bodin
8b2108a940 Clear rackspace deps after delete 2022-08-10 11:39:34 +02:00
Alexandre BODIN
f5b0ca09fa
Merge pull request #14043 from strapi/dep/rackspace 
Deprecate Rackspace upload provider
 2022-08-10 11:34:16 +02:00
Bassel Kanso
b21a0c2abd
Merge pull request #13928 from strapi/fix/counting-when-deep-filtering 
Fix count issue when deep filtering
 2022-08-10 10:42:06 +03:00
Julie Plantey
0ad5587969
Merge pull request #14042 from strapi/fix/asset-dialog-parentFolderId 
[Fix] Folder location AssetDialog
 2022-08-10 09:08:42 +02:00
Pierre Noël
8dd4468a7e
Merge pull request #14040 from strapi/fix/media-location-in-CM 
Fix wrong file location when editing a file from the content-manager
 2022-08-09 19:13:15 +02:00
Pierre Noël
310833b9c8
Merge pull request #13964 from strapi/fix/logo-customization 
Fix upload of menu logo
 2022-08-09 18:41:35 +02:00
derrickmehaffy
c81376a584 Deprecate Rackspace upload provider 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
Moved to: https://github.com/strapi/strapi-provider-upload-rackspace
 2022-08-09 09:21:27 -07:00
Julie Plantey
2f0259c0c6 passing parentFolderId to AssetDialog 2022-08-09 18:14:13 +02:00
Pierre Noël
8758904883
Merge pull request #14003 from WalkingPizza/fix/webhook-triggering 
Add missing permissions to webhook triggering endpoint
 2022-08-09 18:11:59 +02:00
Pierre Noël
b307069465 Populate folder for media for findOne in CM 2022-08-09 17:53:47 +02:00
WalkingPizza
b43a35aaf7 Replace trigger permission with update 2022-08-09 17:20:19 +02:00
Gustav Hansen
ccc854dfc8
Merge pull request #14036 from strapi/revert-13951-master 
Revert "add badgeContent to pluginsSectionsLinks"
 2022-08-09 16:49:03 +02:00
Bassel Kanso
0f451ca49e Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-09 17:11:01 +03:00
Bassel Kanso
de06888375 imporve deepFiltering e2e test 2022-08-09 17:10:54 +03:00
Gustav Hansen
cf44ba82aa
Revert "add badgeContent to pluginsSectionsLinks" 2022-08-09 15:44:35 +02:00
Gustav Hansen
36ecf8c06b
Merge pull request #14025 from strapi/chore/examples-deps-cleanup 
Chore: Update @strapi/* dependencies in examples
 2022-08-09 11:31:34 +02:00
Gustav Hansen
4ea0a3ddd3
Merge pull request #13951 from BasharOsman/master 
add badgeContent to pluginsSectionsLinks
 2022-08-09 11:14:54 +02:00
Gustav Hansen
2a80d7e17b Chore: Remove @strapi/utils dependency from examples 2022-08-09 10:41:58 +02:00
Gustav Hansen
bd6acfdd90 Chore: Update @strapi/plugin-i18n and @strapi/plugin-users-permissions 2022-08-09 10:39:31 +02:00
Gustav Hansen
88add99d13 Chore: Update example @strapi/ dependencies 2022-08-09 09:57:53 +02:00
Bassel Kanso
cdd8be759c Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-09 10:46:50 +03:00
Bassel Kanso
f92ff683ea make 'id' default value for count 2022-08-09 10:45:58 +03:00
Pierre Noël
e6d7714a86
Merge pull request #14002 from WalkingPizza/fix/13999 
Generate fileInfo for every file when uploading in bulk
 2022-08-08 18:38:18 +02:00
Julie Plantey
d340089352
Merge pull request #13846 from smoothdvd/localization-attribute-filter 
update: localized attribute filter
 2022-08-08 18:04:49 +02:00
WalkingPizza
36525d1a26 Add E2E tests with fileInfo 2022-08-08 17:45:21 +02:00
Gustav Hansen
943dae0156
Merge pull request #14018 from strapi/chore/cleanup-travis-config 
Chore: Remove legacy travis config file
 2022-08-08 17:10:22 +02:00
WalkingPizza
483a260c0d Add E2E tests 2022-08-08 16:01:34 +02:00
Gustav Hansen
e218f620e7 Chore: Remove legacy travis config file 2022-08-08 15:50:42 +02:00
Alexandre BODIN
be7b0e973c
Merge pull request #14009 from strapi/chore/remove-admin-dev 
Remove admin-development example
 2022-08-08 15:48:16 +02:00
WalkingPizza
544b1258dd Properly flag that upload has multiple files 2022-08-08 15:26:09 +02:00
WalkingPizza
4e1d735803 Generate a fileInfo array on when necessary 2022-08-08 15:08:26 +02:00
WalkingPizza
073e6cc3be Generate fileInfo for every file when uploading in bulk 2022-08-08 15:00:12 +02:00
Alexandre Bodin
00c62696c8 Merge branch 'master' into chore/remove-admin-dev 2022-08-08 14:44:23 +02:00
Julie Plantey
5517de967c
Merge pull request #13875 from JWesorick/jwesorick/add-locales 
Add more locales. smn, smn_FI, se, se_FI, se_NO, se_SE, gd, gd_GB, ug…
 2022-08-08 14:32:26 +02:00