yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 03:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 117 Branches 489 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
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
Gustav Hansen
69f44aded3
Merge branch 'feature/relations-main-view' into feature/relations-main-view-reducer 2022-08-10 15:49:27 +02:00
Bassel Kanso
b8e0ad7521 update service declaration in Strapi interface 2022-08-10 16:34:23 +03:00
Bassel Kanso
6f4817b2bb Merge branch 'master' into fix/service-typings 2022-08-10 16:08:31 +03:00
Bassel Kanso
a94b5d21ec create a generic service type 2022-08-10 16:04:36 +03:00
Mark Kaylor
74c3352761 Fix custom field type not being passed to data manager provider 2022-08-10 14:57:17 +02:00
Alexandre Bodin
4d60bfdeee v4.3.3 2022-08-10 14:08:54 +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
Mark Kaylor
b3384fb6e8 Merge branch 'custom-fields/add-custom-field-attribute' of github.com:strapi/strapi into add-custom-field-attribute/error-handling 2022-08-10 11:42:29 +02:00
Mark Kaylor
5fd0c2cd7e Add components to unit test 2022-08-10 11:13:05 +02:00
Mark Kaylor
6895559c70 Include components in custom field type conversion on start 2022-08-10 11:08:24 +02:00
Mark Kaylor
cc95d65a3d Move content-type builder server custom field type conversion 2022-08-10 11:07:39 +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
Mark Kaylor
e2dcefdb05 Fix comment 2022-08-10 10:38:15 +02:00
Mark Kaylor
23d1852cf3 Move function to utils folder 2022-08-10 10:38:01 +02:00
Mark Kaylor
17a46cf82d Fix typos and order alphabetically 2022-08-10 10:37:21 +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
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
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
Julie Plantey
915e68bd25 feedback fix 2nd round 2022-08-09 17:08:45 +02:00
Gustav Hansen
48d6822943
Merge pull request #14033 from strapi/feature/relations-main-view-move-relation-reducer 
useCMEditViewDataManager: Remove moveRelation dispatcher
 2022-08-09 16:17:37 +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
5a3f247d34 EditViewDataManagerProvider: Implement new relation data structure 2022-08-09 15:56:48 +02:00
Gustav Hansen
cf44ba82aa
Revert "add badgeContent to pluginsSectionsLinks" 2022-08-09 15:44:35 +02:00
Julie Plantey
51fef616a6 fixed RelationInput story naming 2022-08-09 15:40:48 +02:00
Simone Taeggi
55e3907329 enable api tokens always without permissions 2022-08-09 15:36:11 +02:00