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
33,691 Commits 123 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Julie Plantey
915e68bd25 feedback fix 2nd round 2022-08-09 17:08:45 +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
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
Julie Plantey
34a48a15c0 feedback fixes 2022-08-09 15:30:02 +02:00
Gustav Hansen
acdceebbff
Merge pull request #14031 from strapi/feature/relations-main-view-async-select 
ReactSelect: Export styled async component from react-select
 2022-08-09 15:10:37 +02:00
Mark Kaylor
aaf64cefa0 Fix custom field options 2022-08-09 13:23:53 +02:00
Gustav Hansen
eb983bb4d2 useCMEditViewDataManager: Remove moveRelation dispatcher 2022-08-09 12:58:50 +02:00
Pierre Noël
c115e268cb update test 2022-08-09 12:26:54 +02:00
Pierre Noël
6168d38617 ignore if populating a scalar attribute 2022-08-09 12:19:58 +02:00
Gustav Hansen
89a46d561e ReactSelect: Cleanup getSelectStyles util 2022-08-09 12:19:24 +02:00
Gustav Hansen
884aee6e96 ReactSelect: Export styled async component from react-select 2022-08-09 12:19:24 +02:00
ihmpavel
1cf23e141f
chore: Update after CR 2022-08-09 12:03:51 +02:00
Marc-Roig
10ea1e4ea2 refactor clean url 2022-08-09 11:43:54 +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
Mark Kaylor
7a2c26c40c Use nullish coalescing operator 2022-08-09 11:29:07 +02:00
ivanThePleasant
7291d2e6cf Change user hashing to be a service on admin, introduce adminUserId property to the send function, refactor several events 2022-08-09 12:20:25 +03:00
Gustav Hansen
4ea0a3ddd3
Merge pull request #13951 from BasharOsman/master 
add badgeContent to pluginsSectionsLinks
 2022-08-09 11:14:54 +02:00
Ben Irvin
385fbe500e add non-custom permissions param test 2022-08-09 10:53:16 +02:00
Ben Irvin
a5fcc3eaaf fix failure tests 2022-08-09 10:49:44 +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
Ben Irvin
4229f41b4a use ValidationError 2022-08-09 10:28:42 +02:00
Ben Irvin
895e0c1fe4 return permissions with custom token create 2022-08-09 10:27:34 +02:00
Ben Irvin
e3bd58c69a update test names 2022-08-09 10:23:15 +02:00
Ben Irvin
8cc144679d accept permissions params for api-tokens 2022-08-09 09:59:09 +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
Mark Kaylor
2159aff8f6 Return initial attribute shape when no validator was provided 2022-08-09 09:00:44 +02:00