2920 Commits

Author	SHA1	Message	Date
Simone Taeggi	2f3ca60c63	Merge branch 'main' into features/api-token-v2	2022-08-26 10:06:17 +02:00
Bassel Kanso	db4c3af1f9	remove test	2022-08-26 10:42:01 +03:00
Bassel Kanso	3ce256e279	add content api permissions controller to it's separate file	2022-08-26 10:02:13 +03:00
Convly	29cea1d7cb	null guard for expiration checks	2022-08-25 16:56:50 +02:00
Convly	d834bf6f48	Fix tests	2022-08-25 16:27:18 +02:00
Simone Taeggi	0b4ca50191	show the regenerate button only on update and after creation	2022-08-25 16:19:33 +02:00
Bassel Kanso	4d72da1257	Merge branch 'features/api-token-v2' into api-token-v2/permissions-route	2022-08-25 16:59:12 +03:00
Bassel Kanso	a772f8a8ac	add content type permissions to the permissions route	2022-08-25 16:57:45 +03:00
Convly	87520328bd	Fix expiration date checks on api token strategy	2022-08-25 15:44:10 +02:00
Convly	3568034cb4	Add test for create & update custom token permissions	2022-08-25 15:16:53 +02:00
Convly	8732d07555	Prevent duplicate permissions on create too	2022-08-25 14:25:09 +02:00
Convly	2c71d7d069	Fix permissions update for custom token (uniqueness)	2022-08-25 14:23:36 +02:00
Jean-Sébastien Herbaux	4c6c5e5218	Merge pull request #14214 from strapi/api-token-v2/fix-update-checks ... Fix API tokens' update due to wrong enum values	2022-08-25 14:12:46 +02:00
Convly	46b28db877	Fix invalid enum value used to assert 'changingTypeToCustom'	2022-08-25 13:56:24 +02:00
Ben Irvin	b3fe16b3c6	Merge pull request #14186 from strapi/api-token-v2/backend-expirations ... Api token v2/backend expirations	2022-08-25 13:14:27 +02:00
Gustav Hansen	ffa6a0bc53	Merge pull request #14206 from gitstart/STRAP-65 ... 0 values are not handled correctly in relations	2022-08-25 12:54:50 +02:00
Simone Taeggi	ca44733f41	add the regenerate button	2022-08-25 12:31:52 +02:00
Ben Irvin	9e42345011	yup blocks unexpected fields	2022-08-25 12:01:52 +02:00
Simone Taeggi	cce909d1ae	add the access action to the e2e tests	2022-08-25 10:00:52 +02:00
Mark Kaylor	fc78298ae4	Merge branch 'main' of github.com:strapi/strapi into features/custom-fields	2022-08-25 09:37:19 +02:00
Simone Taeggi	3017fd5e41	update e2e test	2022-08-25 08:52:42 +02:00
gitstart	f67f226102	0 values are not handled correctly in relations	2022-08-25 06:48:27 +00:00
Ben Irvin	2195e9a2f2	fix comment	2022-08-24 19:05:13 +02:00
Ben Irvin	3ca863d80b	fix failing test	2022-08-24 19:02:38 +02:00
Ben Irvin	2b30007f86	lifespan must be greater than zero	2022-08-24 18:05:51 +02:00
Ben Irvin	2359ca1cc6	fix tests	2022-08-24 18:05:36 +02:00
Ben Irvin	53be3b5d30	make name unique	2022-08-24 18:04:12 +02:00
Bassel Kanso	ef922ec0fd	Merge branch 'features/api-token-v2' into api-token-v2/permissions-route	2022-08-24 18:09:43 +03:00
Bassel Kanso	e8bca67186	create route for api token layout	2022-08-24 18:08:17 +03:00
Ben Irvin	6577a9533c	use lodash/fp	2022-08-24 16:29:39 +02:00
Ben Irvin	574448deae	remove comments	2022-08-24 16:27:48 +02:00
Ben Irvin	a3a584d176	allow lifespan to update	2022-08-24 16:27:15 +02:00
Ben Irvin	1bd9fbdd85	fix return type	2022-08-24 16:26:40 +02:00
Simone Taeggi	382a81b94e	Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token	2022-08-24 16:04:02 +02:00
Simone Taeggi	573084845c	Merge branch 'features/api-token-v2' of github.com:strapi/strapi into features/api-token-v2	2022-08-24 16:02:58 +02:00
Simone Taeggi	7e99205b28	Merge branch 'main' into features/api-token-v2	2022-08-24 16:02:46 +02:00
Simone Taeggi	160352044a	Merge branch 'main' into features/api-token-v2	2022-08-24 16:01:33 +02:00
Alexandre Bodin	4c6e67c493	v4.3.6	2022-08-24 15:53:23 +02:00
WalkingPizza	13b9bae03e	Make view config button small	2022-08-24 14:57:16 +02:00
WalkingPizza	a3c0b3b10b	Make all header primary actions small	2022-08-24 14:49:01 +02:00
Alexandre Bodin	a52b053551	v4.3.5	2022-08-24 14:10:18 +02:00
Gustav Hansen	6ceb77e37b	Merge pull request #13597 from Jose4gg/master ... Allow to pass `step` to datetime/time fields	2022-08-24 13:38:20 +02:00
Ben Irvin	568892af97	add controller tests	2022-08-24 13:01:29 +02:00
Jose Gomez	39b8ece5c9	Check if the current time matches the selected interval	2022-08-24 12:42:08 +02:00
Jose Gomez	f30fd3e812	Fix lint errors	2022-08-24 12:42:08 +02:00
Jose Gomez	8e5364b54d	Remove unnecessary getStep for datetime/time condition	2022-08-24 12:42:08 +02:00
Jose Gomez	612112e499	Add step input for datetime/time fields	2022-08-24 12:42:07 +02:00
Ben Irvin	589a5bd1cf	fix test timing	2022-08-24 12:37:21 +02:00
Simone Taeggi	8e26e338e7	update failing snapshot	2022-08-24 12:17:39 +02:00
Simone Taeggi	40b34bd923	Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token	2022-08-24 11:36:02 +02:00