yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 23:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 120 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Convly
3fa282be30 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-27 15:46:54 +02:00
Bassel Kanso
5620190597 remove unneeded async from handler 2022-07-27 16:42:10 +03:00
Convly
b34d634c19 Fix format context creation 2022-07-27 15:41:24 +02:00
Bassel Kanso
db1f5710e2 Merge branch 'master' into fix/graphql-playground 2022-07-27 16:34:19 +03:00
Bassel Kanso
4436f597d0 authorize /graphql route on GET by default 2022-07-27 16:33:29 +03:00
dependabot[bot]
b5802ad882
Bump knex from 1.0.4 to 1.0.7 
Bumps [knex](https://github.com/knex/knex) from 1.0.4 to 1.0.7.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/1.0.4...1.0.7)

---
updated-dependencies:
- dependency-name: knex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-27 12:52:02 +00:00
dependabot[bot]
4760765da9
Bump ora from 5.4.0 to 5.4.1 
Bumps [ora](https://github.com/sindresorhus/ora) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/sindresorhus/ora/releases)
- [Commits](https://github.com/sindresorhus/ora/compare/v5.4.0...v5.4.1)

---
updated-dependencies:
- dependency-name: ora
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-27 12:51:52 +00:00
dependabot[bot]
a7271ddca1
Bump @babel/plugin-transform-modules-commonjs from 7.16.7 to 7.18.6 
Bumps [@babel/plugin-transform-modules-commonjs](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-modules-commonjs) from 7.16.7 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-transform-modules-commonjs)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-modules-commonjs"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-27 12:51:48 +00:00
Convly
74a2b908df v4.3.0 v4.3.0 2022-07-27 14:44:39 +02:00
Gustav Hansen
46fdad0de1
Merge pull request #13499 from strapi/features/ML-folder 
Media Library: Enable asset organization through folders
 2022-07-27 14:32:44 +02:00
Gustav Hansen
608c4e642f
Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 14:32:34 +02:00
Convly
b18253f8ce Merge branch 'master' into releases/4.3.0 2022-07-27 14:27:13 +02:00
Gustav Hansen
887e7b8f7c ML: Add useTracking mocks in tests 2022-07-27 14:11:22 +02:00
Jean-Sébastien Herbaux
6b447a7b67
Merge pull request #13197 from finnsnape/fix/deprecated-uuid 
Fix deprecated UUID
 2022-07-27 14:10:35 +02:00
Bassel Kanso
2eb9b6f001 avoiding auth error in graphql route 2022-07-27 14:59:55 +03:00
Gustav Hansen
39eb8abeea chore: Downgrade react-intl back to 5.20.2 2022-07-27 13:58:15 +02:00
Gustav Hansen
8f32d44b3a
Merge pull request #13862 from strapi/fix/tests-jest-26-compatible 
Upload: Make metrics tests compatible with jest@26
 2022-07-27 13:32:41 +02:00
Gustav Hansen
d886f503ca Jest: add closeTo() utility temporarily 2022-07-27 13:14:49 +02:00
Gustav Hansen
8907153d5c Merge branch 'features/ML-folder' into fix/tests-jest-26-compatible 2022-07-27 12:58:08 +02:00
Gustav Hansen
7e3c08ba3e Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 12:57:38 +02:00
Convly
ba91f47f04 Merge branch 'master' into releases/4.3.0 2022-07-27 12:55:48 +02:00
Jean-Sébastien Herbaux
c1366d400b
Merge pull request #13861 from strapi/fix/rollback-jest-26 
Chore: Rollback to jest@26.x
 2022-07-27 12:53:02 +02:00