yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-23 15:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 127 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gustav Hansen
5ca0538651 Upload: Make metrics tests compatible with jest@26 2022-07-27 12:34:27 +02:00
Gustav Hansen
c77a54f735 Chore: Rollback jest-watch-typeahead to 0.6.5 2022-07-27 12:28:50 +02:00
Gustav Hansen
13d9650ce2 Chore: Rollback to jest@26.x 2022-07-27 12:21:08 +02:00
Mark Kaylor
959992cc95 Add custom field submit handler 2022-07-27 11:57:43 +02:00
Mark Kaylor
9511bc7c15 Add custom field edit action 2022-07-27 11:50:22 +02:00
Mark Kaylor
810effface Close modal or continue when adding customField 2022-07-27 11:27:30 +02:00
Mark Kaylor
f78ead77b3 Use advanced form registered on customField 2022-07-27 11:18:56 +02:00
Convly
2d6afbf044 Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 10:32:43 +02:00
Gustav Hansen
cd963b7a02
Merge pull request #13860 from strapi/fix/numbre-0-null 
EditViewDataManagerProvider: Ensure 0 is not converted to null
 2022-07-27 10:28:22 +02:00
Simone
af565b0cf7
Merge pull request #13815 from strapi/fix/ui-bug-datetimepicker-from-another-locale-13674 
fix/ui-bug-datetimepicker-from-another-locale-13674
 2022-07-27 10:09:28 +02:00
Convly
a4c2f3b46a Merge branch 'master' into releases/4.3.0 2022-07-27 09:44:31 +02:00
Jean-Sébastien Herbaux
0ad69d7571
Merge pull request #12789 from strapi/features/typescript 
[Features] Typescript
 2022-07-27 09:39:29 +02:00
Gustav Hansen
f74ec11a9e EditViewDataManagerProvider: Ensure 0 is not converted to null 2022-07-27 08:23:25 +02:00
Fernando Chavez
660d21f940 Change icon & subText on modal header to show info about the custom field type 2022-07-26 12:55:11 -04:00
Mark Kaylor
976bdfe64b Remove log 2022-07-26 18:11:03 +02:00
Mark Kaylor
46b45be59c Use base form registered on custom field 2022-07-26 18:07:10 +02:00
Convly
1a4ac396c5 Fix unit tests 2022-07-26 17:50:59 +02:00
Pierre Noël
952bca2dce better handle populating dz 2022-07-26 17:13:59 +02:00
Gustav Hansen
c83427e513
Merge pull request #13854 from strapi/fix/13853-get-trad 
EditViewDataManagerProvider: Fix missing params getAPIInnerErrors
 2022-07-26 16:11:13 +02:00
Gustav Hansen
b3b6bdf321
Merge pull request #13851 from strapi/fix/jest-typeahead-peer 
chore: Bump jest-watch-typeahead to 2.0.0
 2022-07-26 16:02:40 +02:00
Gustav Hansen
9b3216715c EditViewDataManagerProvider: Fix missing params getAPIInnerErrors 2022-07-26 15:16:23 +02:00
Mark Kaylor
f8c707a40c Add custom field using underlying data type form 2022-07-26 15:15:18 +02:00
Gustav Hansen
43344fe7c3 chore: Bump jest-watch-typeahead to 2.0.0 2022-07-26 12:58:11 +02:00
Gustav Hansen
98d1692d85
Merge pull request #13771 from strapi/chore/update-koa2-ratelimit 
chore: Update koa2-ratelimit to 1.1.1
 2022-07-26 12:24:39 +02:00