yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 10:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,539 Commits 114 Branches 488 Tags
Commit Graph

30539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Boegie19
03d43a6bf1 fix comment again 2023-04-26 19:02:55 +02:00
Ben Irvin
34c7162ae7
Merge branch 'main' into feature/collection-names-and-ids-uniqueness 2023-04-26 17:41:10 +02:00
Fernando Chavez
6c105bc10e fix lint error 2023-04-26 16:55:10 +02:00
Boegie19
238e82c1cf fix mistake 2023-04-26 16:37:32 +02:00
Boegie19
3f931da243 fix comment? 2023-04-26 16:24:19 +02:00
Fernando Chavez
e4234f0568 fix names on proptypes of new bulk actions bar component 2023-04-26 16:20:35 +02:00
Boegie19
dbff43cc7e fix lint 2023-04-26 16:09:37 +02:00
Ben Irvin
32de22a421
Merge branch 'main' into fix/builder-set-collection-name 2023-04-26 16:01:43 +02:00
Alexandre BODIN
47d423a7f8
Merge pull request #16526 from strapi/release/4.10.1 2023-04-26 15:52:09 +02:00
Alexandre Bodin
68604f9853 Merge branch 'main' of github.com:strapi/strapi into release/4.10.1 2023-04-26 15:50:41 +02:00
Marc-Roig
4dd2d2b5f2 chore: run dependabot sunday night 2023-04-26 15:49:47 +02:00
Alexandre Bodin
b20a1f6d20 Update lockfile 2023-04-26 15:48:24 +02:00
Alexandre Bodin
23b531cef5 v4.10.1 v4.10.1 2023-04-26 15:45:41 +02:00
Alexandre Bodin
8817e737a3 Update lock 2023-04-26 15:45:32 +02:00
Simone Taeggi
acb492a86c Merge branch 'main' into feature/collection-names-and-ids-uniqueness 2023-04-26 15:42:16 +02:00
Alexandre Bodin
ce60415a07 Do not ignore build command on npm publish 2023-04-26 15:34:07 +02:00
Ben Irvin
63e35a6550 allow builder to set collection name 2023-04-26 15:19:01 +02:00
Alexandre Bodin
32d9f9412e Decrease dependabot frequency to weekly 2023-04-26 15:18:53 +02:00
Alexandre Bodin
b36292e67b Merge branch 'releases/4.10.0' 2023-04-26 14:39:05 +02:00
Alexandre Bodin
9b5519778f v4.10.0 v4.10.0 2023-04-26 14:32:28 +02:00
Fernando Chavez
93497de25a change cloneElement for a render function on helper-plugin's dynamicTable 2023-04-26 14:22:29 +02:00
Boegie19
0c2e27ff8c add comment / lint fixes 2023-04-26 14:19:04 +02:00
Gustav Hansen
c7e7683990
Merge pull request #16505 from strapi/feature/review-workflow-1-edit-view-color 
CM: Display stage colors in the edit view sidebar
 2023-04-26 14:12:05 +02:00
Gustav Hansen
2d8c8eec3c
Merge branch 'feature/review-workflow-1' into feature/review-workflow-1-edit-view-color 2023-04-26 14:11:58 +02:00
Marc-Roig
1e6f407cda feat: move extensions to bootsrap instead of register 2023-04-26 13:54:53 +02:00
Marc-Roig
1e545ae1e9 feat: sign media util 2023-04-26 13:54:18 +02:00
Marc-Roig
c921f6d05c feat: create folders for entity service decorator 2023-04-26 13:53:34 +02:00
Marc-Roig
cbb49465bd feat: move sign-media test to utils 2023-04-26 13:52:45 +02:00
Marc
6fc31d84bd
Merge pull request #16482 from strapi/feautre/rw-colors 2023-04-26 13:43:43 +02:00
Boegie19
d6b6cc3d74 fix front 2023-04-26 13:09:24 +02:00
Boegie19
cb6277eb06
Merge branch 'main' into fix-jest-testMatch 2023-04-26 13:05:08 +02:00
Boegie19
74c84c78de reset jest front end 2023-04-26 13:04:52 +02:00
Boegie19
266627f5c0 fix testMatch /ignore 2023-04-26 13:00:22 +02:00
Gustav Hansen
ac89f99b1d CM: Display stage colors in the edit view sidebar 2023-04-26 12:46:05 +02:00
Boegie19
beb7d44517 add ignoreKind 2023-04-26 12:38:36 +02:00
Josh
e3af28c527
Merge pull request #16418 from GitStartHQ/fix/condition-fields-break-checkbox 2023-04-26 11:23:17 +01:00
Josh
5bbdfe72d5
Merge pull request #16464 from strapi/chore/fe-test-utils 2023-04-26 11:23:05 +01:00
Fernando Chavez
ace5e1bef3 add canPublish to conditions to show the bulk buttons 2023-04-26 12:20:38 +02:00
nathan-pichon
5c2422bf8d
docs(contrib): add review workflows tech design 2023-04-26 12:18:50 +02:00
Fernando Chavez
e0e272fede Send the canPublish permissions to the DynamicTable on content manager 2023-04-26 12:10:49 +02:00
Fernando Chavez
21c9cb69ad Add a new bulkActionsBar prop to DynamicTable from helper-plugins and changes to the table on content manager to have the new bulk publish buttons 2023-04-26 11:57:05 +02:00
Ben Irvin
ea75258555 only check if schema exists 2023-04-26 11:56:40 +02:00
Marc-Roig
231a391f15 Merge branch 'feature/entity-service-wrapOutput' into feature/private-s3-url-signing-content-api 2023-04-26 11:46:37 +02:00
Ben Irvin
53a4abeb77 throw error instead of logging 2023-04-26 11:41:03 +02:00
Boegie19
8b6cad699b
Merge pull request #1 from Boegie19/i18n-entity-service-wrapParams 
I18n entity service wrap params
 2023-04-26 11:40:11 +02:00
Boegie19
2945faafdf
Merge branch 'strapi:main' into i18n-entity-service-wrapParams 2023-04-26 11:38:47 +02:00
Boegie19
89b64d70d7
Merge branch 'strapi:main' into i18n-entity-service-decorator-findMany 2023-04-26 11:38:38 +02:00
Ben Irvin
04bbd2215e add error when content type wasn't loaded 2023-04-26 11:35:55 +02:00
Ben Irvin
fa5ec391d8 fix mapping 2023-04-26 11:03:50 +02:00
Josh
d07d489109 chore: convert admin-utils to TS and reorganise preset setup 
chore

chore: fix tests

chore: fix workflow

chore: tidy ups

chore: test fixes

chore: skip nx cache

chore: pr amends

chore: fix rogue incorrect import
 2023-04-26 09:57:17 +01:00