yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 23:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,075 Commits 112 Branches 487 Tags
Commit Graph

6261 Commits

Author SHA1 Message Date
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
Convly
b34d634c19 Fix format context creation 2022-07-27 15:41:24 +02: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
Convly
74a2b908df v4.3.0 2022-07-27 14:44:39 +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
Gustav Hansen
39eb8abeea chore: Downgrade react-intl back to 5.20.2 2022-07-27 13:58:15 +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
Gustav Hansen
5ca0538651 Upload: Make metrics tests compatible with jest@26 2022-07-27 12:34:27 +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
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
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
Pierre Noël
8c426965cc
Merge pull request #13721 from strapi/ML-folder/telemetry-back 
Add backend telemetry events in ML
 2022-07-26 10:53:39 +02:00
Jean-Sébastien Herbaux
f688c85494
Merge pull request #13819 from strapi/fix/missing-creator-fields 
Fix creator fields in REST API
 2022-07-26 10:45:39 +02:00
Mark Kaylor
b67ce749e7 Use initial state 2022-07-26 09:55:12 +02:00
Ben Irvin
2b82678fd6 clean up tests 2022-07-26 09:32:14 +02:00
Ben Irvin
b890696445 clean up tests 2022-07-26 09:28:06 +02:00
Ben Irvin
a499411086 check times remove is called 2022-07-26 09:19:40 +02:00
Ben Irvin
cead6cce88 reset mock fn 2022-07-26 09:17:50 +02:00
smoothdvd
0c37e31344
update: localization attribute filter 2022-07-26 14:22:35 +08:00
Mark Kaylor
1f141a6db2 Remove constant variable 2022-07-25 19:02:35 +02:00
Mark Kaylor
dc41fef1ef Fix PropType bool => string 2022-07-25 18:55:07 +02:00
Mark Kaylor
94222c19d9 Test the FormModalNavigationProvider 2022-07-25 18:53:58 +02:00
Julie Plantey
b1ce10f7f8
Merge pull request #13829 from yangfei4913438/yangfei/translate-user-list 
Fixed the translation problem of zh-Hans on the user list page.
 2022-07-25 18:22:34 +02:00
Julie Plantey
6389876df3
Merge pull request #13833 from smoothdvd/translations-zh-Hans 
update: improve chinese syntax
 2022-07-25 17:53:44 +02:00
Gustav Hansen
8d5ec5dfdc
Merge pull request #13822 from strapi/fix/cm-dynamiczone-label-description 
CM: Fix edit form for dynamiczones (allow label + description)
 2022-07-25 16:07:14 +02:00
Pierre Noël
a5664af2df revert date-fns to 2.28.0 2022-07-25 16:01:54 +02:00
Simone Taeggi
81c5cd0a6a add coverage script to helper-plugin 2022-07-25 15:50:49 +02:00
Pierre Noël
3d231fb376 use date-fns + rename variables 2022-07-25 14:28:59 +02:00
Julie Plantey
ab4ae47d30
Merge pull request #13810 from strapi/fix/password-autocomplete 
[Fix] Passwords autocomplete
 2022-07-25 14:23:35 +02:00