22135 Commits

Author	SHA1	Message	Date
Alexandre BODIN	2eb85b17c7	Merge branch 'main' into chore/rbac-ce	2023-03-13 18:13:11 +01:00
markkaylor	959cf6c2f5	Merge pull request #16033 from alvarolozano/genericinput-json-disabled	2023-03-13 14:24:22 +01:00
markkaylor	f78ba41c59	Merge pull request #15778 from strapi/fix/non-required-json-input	2023-03-13 14:23:08 +01:00
Alexandre Bodin	4f462fb536	Remove unused assets	2023-03-13 14:17:34 +01:00
Alvaro Lozano	2a9979a817	Merge branch 'main' into genericinput-json-disabled	2023-03-13 11:02:55 +01:00
markkaylor	7533a8dcc7	Merge branch 'main' into fix/non-required-json-input	2023-03-13 08:56:46 +01:00
Simone	87ca2cc72b	Merge branch 'main' into data-transfer/limit-token-name-length	2023-03-10 14:57:46 +01:00
Alexandre Bodin	6f225b6979	Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce	2023-03-09 02:45:03 +01:00
Alexandre Bodin	29dadec292	Feedbacks	2023-03-09 02:43:16 +01:00
Alvaro Lozano	b5b5c5834e	Disabled property for JSONInput (GenericInput)	2023-03-08 20:27:21 +01:00
Tobias Frank	b1e105fca5	move unique key up in hierarchy	2023-03-08 15:29:36 +01:00
Simone Taeggi	3a149fe26e	Merge branch 'main' into data-transfer/limit-token-name-length	2023-03-08 12:22:46 +01:00
Simone Taeggi	eae7fc9b1d	chore: update DS to 1.6.5 and fix a unit test	2023-03-08 10:36:08 +01:00
markkaylor	961938ad1e	Merge pull request #16012 from strapi/fix/audit-logs-test-error	2023-03-08 14:19:18 +05:30
Ben Irvin	49df2f46b7	Merge pull request #15974 from strapi/enhancement/transfer-error-messaging	2023-03-08 09:33:45 +01:00
Ben Irvin	16e67e307c	Merge pull request #15395 from dogusdeniz/v4/generator-migration	2023-03-08 09:23:26 +01:00
markkaylor	39e41973a8	Merge branch 'main' into fix/audit-logs-test-error	2023-03-08 13:22:22 +05:30
Simone Taeggi	6bdbe17068	upgrade the design-system and icons dependencies, the snapshots and a failing unit test	2023-03-07 18:13:28 +01:00
Simone Taeggi	84f8c29bc1	Merge branch 'main' into data-transfer/limit-token-name-length	2023-03-07 16:50:59 +01:00
Ben Irvin	2a22da601f	Merge pull request #15877 from strapi/fix/graphql-findone-require-id	2023-03-07 16:28:42 +01:00
Alexandre Bodin	b1d1a6a272	Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce	2023-03-07 16:19:54 +01:00
Simone Taeggi	b6ea2a544e	Merge branch 'main' into data-transfer/limit-token-name-length	2023-03-07 16:08:35 +01:00
Ben Irvin	29ce2b90cb	Merge branch 'main' into v4/generator-migration	2023-03-07 15:48:31 +01:00
Ben Irvin	5c9b3896c8	Merge pull request #15587 from cpaczek/add-cron-removals	2023-03-07 15:46:22 +01:00
Josh	85a51ce618	Merge pull request #16017 from strapi/fix/spacing-should-be-gap	2023-03-07 14:45:10 +00:00
Josh	edc8c32056	chore: replace spacing with gap ... chore: update snapshots fix: css on roles settings	2023-03-07 14:27:20 +00:00
Alexandre Bodin	3d554829db	Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce	2023-03-07 14:46:37 +01:00
Alexandre Bodin	11821500d2	Update FE snapshot	2023-03-07 14:17:01 +01:00
Josh	e438557f17	fix: check if mime or ext are nullish and replace with empty strings	2023-03-07 11:46:03 +00:00
Josh	6b07ba03c0	Merge pull request #15969 from strapi/dependabot/npm_and_yarn/react-select-5.7.0	2023-03-07 09:18:56 +00:00
Josh	024758e731	chore: update snapshots for react-select classNames	2023-03-07 08:35:27 +00:00
Marc	c90c7ee82a	Merge pull request #15978 from strapi/dependabot/npm_and_yarn/chalk-4.1.2	2023-03-07 09:18:45 +01:00
Marc	6b978c911f	Merge pull request #16002 from strapi/fix/remove-media-attribute-validator	2023-03-07 09:07:25 +01:00
Alexandre Bodin	e3a4b431ba	clean comment	2023-03-07 08:41:07 +01:00
Alexandre Bodin	8278afe3f3	Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce	2023-03-07 08:27:15 +01:00
markkaylor	a3ad977212	Merge branch 'main' into fix/audit-logs-test-error	2023-03-07 08:46:39 +05:30
Mark Kaylor	6e96e68a87	Fix tbody cannot appear as child of div error	2023-03-07 08:42:24 +05:30
Alexandre Bodin	6c36872dd2	Fix test	2023-03-06 22:17:56 +01:00
Alexandre Bodin	6a003d738c	Move frontend	2023-03-06 22:15:57 +01:00
Alexandre Bodin	e0e2084422	Move RBAC into CE	2023-03-06 21:46:45 +01:00
Sergio Peña	50235362be	Fix some traslations removing dots	2023-03-06 17:59:13 +00:00
dogusdeniz	93a08dea2c	Merge branch 'main' into v4/generator-migration	2023-03-06 13:33:15 +03:00
Marc-Roig	94d600826f	remove media validator until we find a better solution to validate files	2023-03-06 10:54:20 +01:00
Ben Irvin	e47e7d0bc2	Merge branch 'main' into fix/graphql-findone-require-id	2023-03-06 09:53:51 +01:00
Alexandre BODIN	b9e92de1af	Merge pull request #15976 from strapi/chore/fix-invalid-path ... Fix invalid require using internal paths	2023-03-03 18:41:11 +01:00
Marc	399806ef2c	Merge pull request #15942 from strapi/fix/publish-webhook-with-publishedAt	2023-03-03 17:18:47 +01:00
Alexandre Bodin	e789cd81f3	Avoid local strapi conflicting with global	2023-03-03 17:17:02 +01:00
Alexandre Bodin	5992d968eb	Update requires	2023-03-03 17:03:45 +01:00
Josh	3234fcc61d	Merge pull request #15900 from strapi/fix/relations-caching-between-locales	2023-03-03 15:42:28 +00:00
Marc	6846491a30	Merge branch 'main' into fix/publish-webhook-with-publishedAt	2023-03-03 16:17:36 +01:00