5555 Commits

Author	SHA1	Message	Date
Simone Taeggi	8753fae8ff	Merge branch 'main' into features/api-token-v2	2022-09-14 14:47:38 +02:00
Pierre Noël	5b56324ac8	Merge pull request #14170 from strapi/fix/upload-new-file-to-entity ... Fix relations not correctly set when uploading a new file to an entity	2022-09-13 17:55:06 +02:00
markkaylor	4a3ee5ec5b	Update comment ... Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>	2022-09-13 10:57:25 -04:00
markkaylor	95d7fe5a97	Merge branch 'features/custom-fields' into custom-fields/types	2022-09-13 10:46:53 -04:00
Mark Kaylor	21fd40e243	Merge branch 'main' of github.com:strapi/strapi into features/custom-fields	2022-09-13 10:30:19 -04:00
Mark Kaylor	23d9adbfef	Convert type in register function	2022-09-13 10:04:39 -04:00
Pierre Noël	72eec1fb7c	Merge branch 'main' into fix/upload-new-file-to-entity	2022-09-13 16:00:05 +02:00
Mark Kaylor	22727a5779	Add custom fields description	2022-09-13 07:56:51 -04:00
Julie Plantey	150f697bc8	use custom label for CM LV headers	2022-09-13 10:53:33 +02:00
David Lüder	4ea9d481a9	Merge branch 'main' into filter-translation-neq-removal	2022-09-13 02:29:59 +02:00
Simone Taeggi	4907cbb36b	update test	2022-09-12 23:32:27 +02:00
Simone Taeggi	f3ef246013	fix select all bug	2022-09-12 22:57:04 +02:00
Simone Taeggi	961a3cb202	merge main branch	2022-09-12 22:56:52 +02:00
Mark Kaylor	c4197573cd	Lint fix	2022-09-12 14:53:13 -04:00
Mark Kaylor	923d87fdbf	Move customField to content-type and component valid types	2022-09-12 11:22:10 -04:00
Mark Kaylor	08e40eecf9	Remove type conversion util	2022-09-12 10:44:15 -04:00
Mark Kaylor	1f8b261bc7	Update snapshots	2022-09-12 10:36:42 -04:00
Mark Kaylor	39c04410c1	Convert customField type before sending to server	2022-09-12 10:36:13 -04:00
Marc	9dc51aa95a	Merge branch 'main' into patch-2	2022-09-12 14:59:47 +02:00
Julie Plantey	3b53153723	Merge pull request #14290 from WalkingPizza/fix/13648 ... Trim admin's first name when validating	2022-09-12 10:31:32 +02:00
Konstantin Münster	1ed929d8c0	update sharp in upload package	2022-09-10 15:02:11 +02:00
Julie Plantey	067b1a2987	if no stored theme, store OS theme in local storage	2022-09-09 17:43:05 +02:00
Simone Taeggi	cae16f7f25	Merge branch 'main' into features/api-token-v2	2022-09-09 16:08:28 +02:00
Julie Plantey	760b396b7d	Merge pull request #14292 from Zharkan/fix-fr-translations ... fix: some french translations are not correct	2022-09-09 15:20:49 +02:00
Simone Taeggi	abde7cab04	Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions	2022-09-09 12:44:35 +02:00
Simone Taeggi	4101c523bb	change position to permissions dependency	2022-09-09 12:38:34 +02:00
Ben Irvin	ec7e657958	Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions	2022-09-09 12:11:21 +02:00
Rémi de Juvigny	403743fe81	Add custom fields interface	2022-09-09 11:14:09 +02:00
Simone Taeggi	b4e083fdeb	add dependencies	2022-09-09 00:54:00 +02:00
Simone Taeggi	2870ba20f9	Merge branch 'features/api-token-v2' into api-token-v2/regenerate-permission	2022-09-09 00:53:32 +02:00
Simone Taeggi	81df80e7ba	upgrade strapi permission version to 4.3.8	2022-09-09 00:29:45 +02:00
Simone Taeggi	539e9ed020	upgrade strapi utils version dependency	2022-09-09 00:27:20 +02:00
Simone Taeggi	9a2ed26d39	update node engine to 18 for the permission package	2022-09-09 00:22:18 +02:00
Simone Taeggi	8e97e90c3d	add regenerate command even on read	2022-09-09 00:09:16 +02:00
Simone Taeggi	f20dd5cce0	Revert "add regenerate command even on read" ... This reverts commit fc53ef1a7b72c02c45152ff47b32a989a616b721.	2022-09-08 23:55:12 +02:00
Simone Taeggi	1a289ca1ff	Revert "merge main" ... This reverts commit 5dc28ed5e5ead9b83b8bb30f96efc6eb6f1d3e3f.	2022-09-08 23:49:07 +02:00
Simone Taeggi	5dc28ed5e5	merge main	2022-09-08 23:40:39 +02:00
Simone Taeggi	a0057b5b0b	Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions	2022-09-08 22:21:24 +02:00
Simone Taeggi	e1a0ae803e	Merge branch 'main' into features/api-token-v2	2022-09-08 22:16:55 +02:00
Simone Taeggi	3d5eaebe12	refactor using setField	2022-09-08 22:09:15 +02:00
Simone Taeggi	cb69ec34a4	Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions	2022-09-08 17:06:16 +02:00
David Lüder	f0769a5916	Remove duplicate $ne/$neq-Translation in zh-Hans	2022-09-08 15:00:49 +00:00
David Lüder	14821c6ac5	Fix intlLabel for $ne-Filter for correct translations	2022-09-08 15:00:08 +00:00
Alexandre Bodin	d0404ffa7a	Update readme with node 18 support	2022-09-08 16:38:57 +02:00
Simone Taeggi	fc53ef1a7b	add regenerate command even on read	2022-09-08 15:44:43 +02:00
Simone Taeggi	a0d9779c5e	replace Number with parseInt	2022-09-08 15:31:17 +02:00
Simone Taeggi	eefc744724	fix delete all permissions on create	2022-09-08 15:21:06 +02:00
Alexandre BODIN	59b83c5953	Merge pull request #14320 from strapi/chore/eslint ... chore/eslint	2022-09-08 14:45:12 +02:00
Simone Taeggi	85219da3e6	fix lifespan validation keyboard navigation	2022-09-08 12:05:22 +02:00
Pierre Noël	79e0671e61	Merge branch 'main' into fix/upload-new-file-to-entity	2022-09-08 11:49:27 +02:00