yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 116 Branches 489 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ihmpavel
6ae4e4a968
Merge branch 'strapi:master' into graphql-bounded 2022-07-29 13:59:20 +02:00
ihmpavel
14d215c602
chore: Unify template spacing 2022-07-29 13:45:20 +02:00
Mark Kaylor
9c8cf0ebfc Test custom field data manager provider actions 2022-07-29 12:40:52 +02:00
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Ben Irvin
46ea867a27 fix conditions test 2022-07-29 12:22:22 +02:00
Gustav Hansen
4631f9f87b
Merge branch 'master' into feature/replace-virtualized-window 2022-07-29 12:11:04 +02:00
Gustav Hansen
05c400c391 ComponentIconPicker: Replace react-virtualized with react-window 2022-07-29 12:06:28 +02:00
Convly
4ebc128ffb Make users-permissions auth strategy use the content API permission engine 2022-07-29 10:17:06 +02:00
Ben Irvin
526d2e9025 fix tests 2022-07-29 09:42:26 +02:00
Ben Irvin
04c9514ab7 test validate hook timing 2022-07-29 09:27:18 +02:00
Ben Irvin
525e535fdf test format.permission 2022-07-29 09:19:06 +02:00
Fernando Chavez
b39d010881 Move SubHeader component and rename it to FormModalSubHeader 2022-07-28 18:21:08 -04:00
Ben Irvin
de5c1a7f57 add todo tests 2022-07-28 19:40:43 +02:00
Ben Irvin
17036e964c test hooks 2022-07-28 19:15:40 +02:00
Ben Irvin
a59821a242 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/engine-abstraction-tests 2022-07-28 18:38:14 +02:00
Ben Irvin
f4a594e9c9 add tests 2022-07-28 18:33:02 +02:00
Ben Irvin
a8cfa42a70 add more examples 2022-07-28 17:51:03 +02:00
Ben Irvin
078fb244a8 add helper functions 2022-07-28 17:50:44 +02:00
Convly
43e360a641 Fix format permission handler argument 2022-07-28 17:05:29 +02:00
markkaylor
d35aee9cc9
Merge pull request #13830 from strapi/custom-fields/fix-convert-type 
[Custom fields] Fix custom field type conversion on start
 2022-07-28 16:41:36 +02:00
markkaylor
e222cb29da
Merge pull request #13820 from strapi/custom-fields/list-custom-fields 
[Custom fields] list custom fields
 2022-07-28 16:40:08 +02:00
Gustav Hansen
6c6332a6e7
Merge pull request #13878 from strapi/fix/13868-relation-1-1-styles 
SelectOne: Fix component styles
 2022-07-28 15:44:54 +02:00
Gustav Hansen
e17d75315b
Merge pull request #13884 from strapi/fix/13868-relation-bullet-skew 
Relation: Fix skewed draft/ publish bullet indicator
 2022-07-28 15:44:35 +02:00
Bassel Kanso
cf6c08de92
Merge pull request #13838 from strapi/fix/graphql-playground 
Fix/graphql playground
 2022-07-28 15:53:04 +03:00
Fernando Chavez
bd33f20b73 New component SubHeader for FormModal 2022-07-28 07:26:10 -04:00
Ben Irvin
8ec0977584 add initial tests 2022-07-28 13:16:14 +02:00
Gustav Hansen
954a05105f Select: Fix skewed draft/ publish bullets 2022-07-28 12:20:51 +02:00
Gustav Hansen
ad4c285d37 SelectOne: Update draft/ publish colors, fix skewed bullet 2022-07-28 12:20:24 +02:00
Mark Kaylor
710e00834e Remove old logic 2022-07-28 12:13:31 +02:00
Mark Kaylor
de8d14bd69 Fix typo 2022-07-28 12:13:14 +02:00
Convly
80713eddff Merge branch 'api-token-v2/engine-abstraction' of github.com:strapi/strapi into api-token-v2/engine-abstraction 2022-07-28 11:57:52 +02:00
Convly
1453bc0d67 Fix light typings issues 2022-07-28 11:57:40 +02:00
Jean-Sébastien Herbaux
18301960d3
Update packages/core/permissions/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-07-28 11:37:03 +02:00
Convly
0eaa5d2915 Merge branch 'features/api-token-v2' into api-token-v2/engine-abstraction 2022-07-28 11:36:23 +02:00
Convly
0a1cc38e06 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-28 11:36:01 +02:00
Convly
5291691d47 Merge branch 'master' into features/api-token-v2 2022-07-28 11:35:51 +02:00
Mark Kaylor
f8ba0b98a7 Abstract add and edit attribute logic 2022-07-28 11:22:26 +02:00
Gustav Hansen
9cc37f9511 chore: Remove react-select as dependency from admin 2022-07-28 11:07:29 +02:00
Gustav Hansen
6d49c90e86 SelectOne: Replace Select with ReactSelect from the helper-plugin 2022-07-28 11:07:00 +02:00
Pierre Noël
06694ec71d
Merge pull request #13871 from strapi/fix/ML-bulk-delete-without-a-folder-selected 
Fix the bulk delete of files in the Media Library
 2022-07-28 10:37:00 +02:00
Pierre Noël
1f7e485278 add e2e to bulk-delete only files and only folders 2022-07-27 18:02:47 +02:00
Pierre Noël
faa4fbaaff Fix the bulk delete in the ML when no folders are selected 2022-07-27 17:52:33 +02:00
Mark Kaylor
be8a45af9f Test data manager provider add custom field action 2022-07-27 17:32:03 +02:00
Mark Kaylor
a20ad9955f Update form modal navigation tests 2022-07-27 17:31:03 +02:00
Fernando Chavez
0c375fff16 Change icon & header text if there is a custom field 2022-07-27 10:35:48 -04:00
Bassel Kanso
66502b797e
Update packages/plugins/graphql/server/bootstrap.js with a comment 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-07-27 17:20:02 +03:00
Fernando Chavez
d866041971 Merge branch 'custom-fields/add-custom-field-attribute' of github.com:strapi/strapi into custom-fields/add-modal-header 2022-07-27 10:11:43 -04:00
Mark Kaylor
94df69437b Remove duplicate return statement 2022-07-27 16:06:02 +02:00
Mark Kaylor
f1a271cf72 Convert custom field type for contentTypes and components 2022-07-27 16:02:14 +02:00
Bassel Kanso
9692c6fa8f Merge branch 'master' into features/api-token-v2 2022-07-27 17:01:11 +03:00