yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 22:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,312 Commits 123 Branches 496 Tags
Commit Graph

23312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy
bdb7c3adef
Update content-api.yaml 
Fixed typo in documentation
 2022-08-10 22:58:41 +03:00
Ben Irvin
f16d86f8ec remove test 2022-08-10 17:36:21 +02:00
Ben Irvin
fe51a07d01 fix updates 2022-08-10 17:35:15 +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
Marc-Roig
aeb980dd59 remove mock from webhook test 2022-08-10 13:57:09 +02:00
Marc-Roig
1d2e240961 create entity variable in webhook test 2022-08-10 13:21:59 +02:00
Marc-Roig
135336e4be test entity service webhooks 2022-08-10 13:06:06 +02:00
Simone Taeggi
1000f6aed3 add the read icon to see the read view with enabled fields 2022-08-10 12:09:00 +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
Ben Irvin
4f39f046d9 test update 2022-08-10 10:57:19 +02:00
Ben Irvin
7d59934668 allow empty permissions array on non-custom tokens 2022-08-10 10:55:49 +02:00
Simone Taeggi
9ee1a1be8c Merge branch 'features/api-token-v2' into api-token-v2/rbac-on-api-token-list 2022-08-10 10:01:45 +02:00
Bassel Kanso
f323f312df
Merge pull request #13997 from strapi/api-token-v2/rbac-on-api-token-creation 
make user able to see token details if they have read permissions
 2022-08-10 10:57:42 +03: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
Marc-Roig
c7f14a4706 remove function comment as it is self explanatory 2022-08-10 09:14:45 +02:00
Marc-Roig
504c333bcb change function name to getFilenameFromURL 2022-08-10 09:13:15 +02: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
Marc-Roig
7bf2612a15 use last element of path as filename 2022-08-09 18:14:15 +02:00
Julie Plantey
2f0259c0c6 passing parentFolderId to AssetDialog 2022-08-09 18:14:13 +02:00
Simone Taeggi
e8d0967485 Merge branch 'features/api-token-v2' into api-token-v2/rbac-on-api-token-list 2022-08-09 18:13:05 +02:00
Simone Taeggi
cab6ff447a update snapshot 2022-08-09 18:12:27 +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
Marc-Roig
9e67d3b706 remove webhook comment 2022-08-09 18:11:03 +02:00
Pierre Noël
b307069465 Populate folder for media for findOne in CM 2022-08-09 17:53:47 +02:00
Ben Irvin
6eba2d80bf fix tests to work with custom token changes 2022-08-09 17:49:28 +02:00
Ben Irvin
e7294f812d only return permissions with custom tokens 2022-08-09 17:48:52 +02:00
Marc-Roig
59b39b47b7 comments 2022-08-09 17:46:57 +02:00
Marc-Roig
62bd2b1708 trigger webhook on bulk delete 2022-08-09 17:44:57 +02:00
WalkingPizza
b43a35aaf7 Replace trigger permission with update 2022-08-09 17:20:19 +02:00
Marc-Roig
305dc187be removing components before deleting entity 2022-08-09 17:15:40 +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