9899 Commits

Author	SHA1	Message	Date
Ben Irvin	376f409456	Merge pull request #15426 from strapi/chore/fix-version-table-order	2023-01-25 11:35:19 +01:00
Rémi de Juvigny	c5c20a3ce0	Fix EE settings menu	2023-01-25 11:28:23 +01:00
Jean-Sébastien Herbaux	14aa228ab6	Merge pull request #15565 from strapi/deits/fix-diagnostic-error-format	2023-01-25 10:33:16 +01:00
Jean-Sébastien Herbaux	9563d4cf9d	Merge pull request #15530 from strapi/deits/error-database-connection	2023-01-25 10:32:54 +01:00
Convly	eb6e6db843	Fix duplicate errors being logged	2023-01-25 10:31:01 +01:00
Rémi de Juvigny	2f7de9ab4e	WIP move audit logs frontend to ee	2023-01-25 10:30:26 +01:00
Bassel Kanso	acfb19be24	Merge pull request #15564 from strapi/deits/fix-gitkeep ... re-creating .gitkeep	2023-01-25 11:29:33 +02:00
Bassel	6f6c24d133	re-creating .gitkeep	2023-01-25 11:24:39 +02:00
Ben Irvin	33429cef5b	clean up	2023-01-25 10:21:24 +01:00
Gustav Hansen	f55c877fa4	WYSIWYG: Remove hard-coded id (field might be used multiple times)	2023-01-25 10:09:50 +01:00
Gustav Hansen	0dab50e660	WYSIWYG: Prevent preview pane toolbar from shrinking	2023-01-25 10:07:01 +01:00
Convly	62725c8410	Merge branch 'features/deits' into deits/diagnostics	2023-01-25 10:02:43 +01:00
Convly	31a4925824	Merge branch 'main' into features/deits	2023-01-25 09:57:35 +01:00
Bassel Kanso	87bec86243	Merge pull request #15485 from strapi/deits/rollbacks ... [DEITS] Rollback import after failure	2023-01-25 10:48:04 +02:00
Bassel Kanso	8810b049f5	Merge pull request #14389 from strapi/chore/transactions ... Use transactions and expose a transactional API	2023-01-25 10:45:32 +02:00
Gustav Hansen	8c52770ae4	WYSIWYG: Fix CSS flex setup to take the toolbar into account	2023-01-25 09:45:03 +01:00
Ben Irvin	8bcafb42ed	add some simple tests	2023-01-25 09:35:32 +01:00
Gustav Hansen	ccab323cf2	Merge pull request #15430 from strapi/enhancement/ctb-edit-ct-draft-publish ... CTB: Replace ToggleInput with Checkbox for the d&p switch	2023-01-25 08:49:11 +01:00
Christian Capeans	8b0bc45840	Merge branch 'deits/diagnostics' into deits/error-database-connection	2023-01-24 19:37:52 +01:00
Bassel Kanso	1e867f152d	Merge branch 'main' into chore/transactions	2023-01-24 19:08:13 +02:00
Bassel	65660d18e1	add some adittional tests	2023-01-24 19:07:43 +02:00
Bassel	ec9150b1d8	add some unit tests	2023-01-24 18:56:41 +02:00
Mark Kaylor	963f651b81	Merge branch 'main' of github.com:strapi/strapi into feature/audit-logs	2023-01-24 17:25:50 +01:00
Julie Plantey	8b135b0725	update video preview size to be the same size as Avatar	2023-01-24 16:55:21 +01:00
Gustav Hansen	8db988bec2	ReviewWorkflows: Render list of stages on settings page	2023-01-24 16:39:30 +01:00
Josh	70f188c78f	Merge pull request #15547 from strapi/chore/ds-160	2023-01-24 15:28:57 +00:00
Convly	80c0153907	Fix diff formatting for schemas matching	2023-01-24 16:15:55 +01:00
Bassel	cc3c50c24c	remove chalk coloring from error	2023-01-24 16:59:57 +02:00
Bassel	18bcfd95d3	refactoring createLinkQuery transaction	2023-01-24 16:57:12 +02:00
Christian Capeans	5f8422140e	Add operation to the format diagnostic functino	2023-01-24 15:54:16 +01:00
Gustav Hansen	d61d4ece5e	Merge pull request #15549 from strapi/fix/wysiwyg-preview ... WYSIWYG: Fix preview pane styles	2023-01-24 15:35:57 +01:00
Bassel	936d8abae2	add types for transaction	2023-01-24 16:35:06 +02:00
Josh	6b43c01732	fix: update to 1.6.1 to fix styling issue with buttons	2023-01-24 14:12:56 +00:00
Gustav Hansen	e7915a01f2	WYSIWYG: Fix preview styles	2023-01-24 15:08:06 +01:00
Convly	516963a080	Merge branch 'main' of github.com:strapi/strapi into features/deits	2023-01-24 15:07:37 +01:00
Bassel	f0dbb4be31	apply fixes: ... - fix callback return type - fix callback params	2023-01-24 15:55:43 +02:00
Christian Capeans	fb850a43dc	Remove unnecessary part of import	2023-01-24 14:52:03 +01:00
Marc-Roig	73dbd2cfd9	workflows find and findOne services	2023-01-24 13:58:28 +01:00
Marc-Roig	72f67c5c9c	add services to workflows controller	2023-01-24 13:58:10 +01:00
Christian Capeans	9e19aed7fc	Remove unnecessary typing	2023-01-24 13:47:41 +01:00
Christian Capeans	5c9831d547	Merge branch 'features/deits' into deits/diagnostics	2023-01-24 13:43:39 +01:00
Bassel	d11bd7af0a	apply fixes: ... - fix callback return type - fix callback params	2023-01-24 14:39:24 +02:00
Christian Capeans	56528817e2	Fix tests	2023-01-24 13:34:42 +01:00
Josh	e8bc90744d	chore: update DS to 1.6.0	2023-01-24 11:34:12 +00:00
Rémi de Juvigny	1935ec5031	Fix entity service events tests	2023-01-24 12:29:09 +01:00
Rémi de Juvigny	9b65cc4b97	Merge pull request #15529 from strapi/audit-logs/log-url ... [Audit logs] Manage opened log in URL params	2023-01-24 11:39:31 +01:00
Jamie Howard	2153d4d90d	Merge pull request #15424 from strapi/feature/min-max-description	2023-01-24 10:16:55 +00:00
Christian Capeans	39c8a80339	Fix file structure	2023-01-24 10:59:45 +01:00
Bassel	81f4a931a9	fix unit tests	2023-01-24 11:24:28 +02:00
Pierre Noël	32d057b535	Merge pull request #15412 from strapi/security/updateKnex ... Update Knex to 2.4.0 to fix CVE-2016-20018	2023-01-24 10:02:27 +01:00