21350 commits

Author	SHA1	Message	Date
Adria Navarro	31469cb2d6	Fix rebuilding shared-core	2023-10-10 16:05:41 +02:00
Adria Navarro	e0f51fb7db	Fixes	2023-10-10 15:53:10 +02:00
Adria Navarro	36909ff7f6	Export bannedDisplayColumnTypes	2023-10-10 15:50:12 +02:00
Adria Navarro	530857a6ff	Fix	2023-10-10 15:39:05 +02:00
Adria Navarro	c49a16fdac	Fix tests	2023-10-10 15:35:00 +02:00
Adria Navarro	21420c59fa	Fix order	2023-10-10 14:39:55 +02:00
Adria Navarro	78335be26a	Clean	2023-10-10 14:20:26 +02:00
Adria Navarro	e473c8b3a8	Fix tests	2023-10-10 14:07:12 +02:00
mike12345567	012d0f4fe9	Removing the option to add a filter to the dataset of a user column picker, as there is no current API for searching this.	2023-10-10 12:54:49 +01:00
Adria Navarro	48afa2aa0d	Lint	2023-10-10 13:52:47 +02:00
Adria Navarro	bd82dae565	Display user/users fields	2023-10-10 13:52:47 +02:00
Adria Navarro	d3e8e1f4f8	Fix importing	2023-10-10 13:52:47 +02:00
Adria Navarro	b966ed221d	Fix bulk delete	2023-10-10 13:52:47 +02:00
Adria Navarro	71159e4f4a	Import internal	2023-10-10 13:52:47 +02:00
Adria Navarro	fd414dbe4b	Enable importing bbrefs as string csv	2023-10-10 13:52:47 +02:00
Adria Navarro	62c6631bc8	Don't cast on the fe	2023-10-10 13:52:47 +02:00
Adria Navarro	979c2aeb00	Return only id and primary display	2023-10-10 13:52:47 +02:00
Adria Navarro	df97b7ad93	Expect BB ref data as csv strings	2023-10-10 13:52:47 +02:00
Adria Navarro	adf5e6bcf2	Allow users	2023-10-10 13:52:47 +02:00
Adria Navarro	f22467fa53	Validate user column	2023-10-10 13:52:47 +02:00
Adria Navarro	a514358e57	Allow selecting user column type	2023-10-10 13:52:47 +02:00
Michael Drury	5783ae3e00	Merge branch 'master' into feature/multi-user-type-column	2023-10-10 12:38:51 +01:00
mike12345567	5099d6c3a5	Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/null-user-column-value	2023-10-10 12:10:56 +01:00
mike12345567	27abfdccc2	Removing onChange handler.	2023-10-10 11:50:45 +01:00
mike12345567	95caee66a7	PR comments.	2023-10-10 11:22:59 +01:00
mike12345567	2ef5cb3894	Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/null-user-column-value	2023-10-09 18:31:13 +01:00
mike12345567	fa5e340e60	Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/external-table-keep-types	2023-10-09 18:30:47 +01:00
mike12345567	635f33f81e	Make sure that external tables preserve the BB_REFERNECE type, under the hood it is text/array, but it should continue to be treated correctly as its own indpendent type when updating Budibase tables (fetching).	2023-10-09 18:28:09 +01:00
mike12345567	c87a67a37a	Converting user IDs where necessary to global user IDs in the frontend, correcting the null entry when using current user IDs, or other user IDs, as a default value for a user column form type.	2023-10-09 18:18:34 +01:00
Andrew Kingston	b17ec630c1	Ensure user table editing is still allowed for old apps that are imported	2023-10-09 15:09:11 +01:00
Andrew Kingston	73e208292f	Simplify logic to be more readable	2023-10-09 15:05:57 +01:00
Andrew Kingston	a4e3cd72cc	Add new app feature flag to allow disable user metadata columns in new apps, but allow them in old apps	2023-10-09 15:01:16 +01:00
Adria Navarro	7d6cd53c29	Add comments	2023-10-09 15:37:42 +02:00
Adria Navarro	6f77be622f	Simplify	2023-10-09 15:36:17 +02:00
Adria Navarro	0909e0547e	Process formulas after processing complex fields	2023-10-09 15:30:07 +02:00
Adria Navarro	065e633742	Don't allow users column as primary display	2023-10-09 15:30:07 +02:00
Adria Navarro	d7aa23f740	Testing	2023-10-09 13:21:40 +02:00
Adria Navarro	a5477f14d2	Handle users on search input	2023-10-09 13:21:27 +02:00
Adria Navarro	cd5835bfeb	Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support	2023-10-09 09:37:44 +02:00
Andrew Kingston	8ce001cd4a	Merge branch 'develop' into grid-mobile-scrolling	2023-10-09 08:23:43 +01:00
Adria Navarro	047936bcbf	Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support	2023-10-09 09:22:55 +02:00
melohagan	d8f1b7960e	Fix form block crash on no data tables (#11995) ... * Fix form block crash on no data tables * Refactor * Refactor	2023-10-09 08:22:19 +01:00
Andrew Kingston	2171b14f50	Merge branch 'develop' into grid-clipboard	2023-10-09 08:06:18 +01:00
Andrew Kingston	0303027754	Merge branch 'develop' into grid-mobile-scrolling	2023-10-09 08:06:04 +01:00
mike12345567	0dc28122fa	Adding test case.	2023-10-06 16:38:36 +01:00
mike12345567	d4335bca73	Quick fix for saving current user._id - make sure it is the correct format of ID.	2023-10-06 16:31:48 +01:00
mike12345567	df29f4c30f	Merge branch 'develop' of github.com:Budibase/budibase into backmerge-6-10-23	2023-10-06 15:56:09 +01:00
mike12345567	d8b7f930e9	Merging.	2023-10-06 15:55:10 +01:00
Michael Drury	c7c63a7b83	Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support	2023-10-06 15:54:12 +01:00
Michael Drury	7934e984cc	Merge branch 'master' into fix/user-column-search-mapping	2023-10-06 14:30:09 +01:00
melohagan	23b7a8de72	Allow relationship to be deleted even if missing (#11991) ... * Allow relationship to be deleted even if missing * Comment	2023-10-06 14:17:36 +01:00
mike12345567	575693d69a	Updating pro.	2023-10-06 14:07:12 +01:00
Adria Navarro	434f2a0670	More nx cache	2023-10-06 14:52:32 +02:00
Adria Navarro	13e985813c	Merge branch 'master' into BUDI-7573/use_existing_image_cache	2023-10-06 14:44:35 +02:00
Adria Navarro	da53f0a366	Cache output files	2023-10-06 14:32:17 +02:00
mike12345567	bc17bc43fa	Fixing issue brought up by some unit tests.	2023-10-06 13:32:12 +01:00
mike12345567	7acc164e12	Fix build.	2023-10-06 13:28:27 +01:00
mike12345567	017b522a3f	Comment to explain function.	2023-10-06 12:56:55 +01:00
mike12345567	18cca671d4	PR comments.	2023-10-06 12:56:07 +01:00
Adria Navarro	0d21d13e4b	Extract functions	2023-10-06 13:53:34 +02:00
mike12345567	6e6c5bc776	Handle arrays and fix issue brought up by REST testcase.	2023-10-06 12:31:52 +01:00
Michael Drury	8f41554c6f	Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support	2023-10-06 12:18:20 +01:00
mike12345567	cfe261a8f6	Merge branch 'master' of github.com:Budibase/budibase into fix/user-column-search-mapping	2023-10-06 12:16:54 +01:00
mike12345567	dc50515bcc	Adding negative test case and fixing build issue.	2023-10-06 12:16:37 +01:00
mike12345567	3de8c53166	Adding a mapping layer to search queries so that we can map search inputs based on the table schema if desired - primarily for the user column.	2023-10-06 11:57:11 +01:00
Adria Navarro	19254a3f8d	Update rollup	2023-10-06 12:31:37 +02:00
Adria Navarro	c60de3ebe0	Update vite dependencies	2023-10-06 12:29:12 +02:00
mike12345567	7976772842	Fixing test case.	2023-10-05 23:19:11 +01:00
mike12345567	10fffef467	Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf	2023-10-05 23:05:18 +01:00
mike12345567	5810529350	Quick fix for #11982 - check for both deprecated docker-compose and docker compose V2.	2023-10-05 23:03:34 +01:00
mike12345567	ee4a042204	Typing fixes - unsure why all of these came up suddenly.	2023-10-05 18:40:56 +01:00
mike12345567	3e2f9dfc4e	Further enhancement, client library sends up the column it wants enriched and then we can ignore everything else, makes a big difference for enriching users (with a lot of relationships).	2023-10-05 18:23:18 +01:00
Adria Navarro	9a97f5f076	Fix devdependency type	2023-10-05 13:38:46 +02:00
Adria Navarro	58a22ccde8	Fix initialisation of simple types	2023-10-05 11:16:52 +02:00
mike12345567	069fd33964	Some work towards improving performance of internal DB enrichment, there is a problem with cyclic enrichment due to the outputProcessing, need to decide how to handle formulas on enrichment.	2023-10-04 19:18:21 +01:00
Adria Navarro	6d387946a6	Merge branch 'master' into BUDI-7573/use_existing_image_cache	2023-10-04 18:08:31 +02:00
Adria Navarro	f215f69067	Lint	2023-10-04 17:56:04 +02:00
Adria Navarro	91306c79eb	Fix tests	2023-10-04 17:55:23 +02:00
Adria Navarro	2d0ac5ffba	Fix filtering	2023-10-04 17:55:23 +02:00
Adria Navarro	39b5a2b539	Allow filtering	2023-10-04 17:55:23 +02:00
Adria Navarro	ee11ebf8e4	Do not allow multiple users for google sheets	2023-10-04 17:55:23 +02:00
Adria Navarro	46b85ac12c	Multiple users column	2023-10-04 17:55:23 +02:00
Adria Navarro	753cb442c2	Allow edit	2023-10-04 17:55:23 +02:00
Adria Navarro	9b45c1fe92	Fix wrong constraints	2023-10-04 17:55:23 +02:00
Adria Navarro	6d5e95af6e	Add icons	2023-10-04 17:55:23 +02:00
Adria Navarro	583721ac47	Remove composite types	2023-10-04 17:55:23 +02:00
Adria Navarro	17df64c588	Allow selecting multiple users	2023-10-04 17:55:23 +02:00
Adria Navarro	23702391ff	Use field ids instead of playing with the type/subtype	2023-10-04 17:55:23 +02:00
Adria Navarro	b19c5ae5c6	Add subtype	2023-10-04 17:55:23 +02:00
Adria Navarro	e01600d1bb	Remove composite key	2023-10-04 17:55:23 +02:00
Adria Navarro	e77cc3dac8	Specify column types instead of using spread	2023-10-04 17:55:23 +02:00
Adria Navarro	deeb8ee254	Remove relationshiptype from user type	2023-10-04 17:55:23 +02:00
Adria Navarro	bf632ae9a8	Fix	2023-10-04 17:55:23 +02:00
Adria Navarro	d22fac9bf9	Replace relationshipType for subtype	2023-10-04 17:55:23 +02:00
Adria Navarro	fe15b4d1e3	Use types	2023-10-04 17:55:23 +02:00
Martin McKeaveney	d86c251699	Merge branch 'develop' into grid-clipboard	2023-10-04 11:57:45 +01:00
Adria Navarro	63306d3509	Fix filtering pg datasource	2023-10-04 12:20:19 +02:00
Adria Navarro	680ce087ba	Merge branch 'master' into BUDI-7573/use_existing_image_cache	2023-10-04 00:28:33 +02:00
Adria Navarro	18545b1c79	Fix vulnerabilities	2023-10-03 23:45:39 +02:00
Adria Navarro	15fd357b54	Update @google-cloud/firestore (yarn audit)	2023-10-03 23:09:57 +02:00
Adria Navarro	9dd5530c4e	More cleanups	2023-10-03 22:39:00 +02:00
Adria Navarro	16752bb437	More cleanups	2023-10-03 22:37:00 +02:00
melohagan	4df2f622db	Do not re-initialise options if changed (#11964) ... * Do not re-initialise options if changed * Init options onMount	2023-10-03 20:55:53 +01:00
Adria Navarro	42b75a1ec3	Use script	2023-10-03 19:55:23 +02:00
Adria Navarro	429530a34d	Clean predocker steps	2023-10-03 19:55:23 +02:00
Adria Navarro	94e9715fef	Build only required packages	2023-10-03 19:55:23 +02:00
Adria Navarro	e7b47d08bb	Do not sanitize on operator change	2023-10-03 18:39:52 +02:00
mike12345567	5eacc9d93e	Lint fix.	2023-10-03 17:34:20 +01:00
mike12345567	2c20d0b738	Spelling fix.	2023-10-03 17:33:58 +01:00
Adria Navarro	02bfaa4378	Clean multiple user checks to simplify	2023-10-03 18:29:35 +02:00
Adria Navarro	2c49638766	Lint	2023-10-03 17:37:14 +02:00
Adria Navarro	3f37416016	Sanitise field	2023-10-03 17:35:40 +02:00
Adria Navarro	0da029c896	Sanitise field	2023-10-03 17:35:36 +02:00
Adria Navarro	83790bc324	Lint	2023-10-03 17:14:33 +02:00
Adria Navarro	4b23139bfe	Merge branch 'master' into budi-7583/filtering-data-provider-with-a-user-column-does-not-work	2023-10-03 17:08:33 +02:00
Adria Navarro	da95c32a0c	Simplify code	2023-10-03 17:06:17 +02:00
Adria Navarro	8ebf473ab2	Disable multiple users for now	2023-10-03 16:58:49 +02:00
Adria Navarro	dbd5f7a134	In instead of ContainsAny	2023-10-03 16:58:39 +02:00
Andrew Kingston	5096170575	Merge branch 'develop' into grid-row-click-events	2023-10-03 15:19:01 +01:00
Adria Navarro	0053103974	Fix external	2023-10-03 15:41:00 +02:00
Adria Navarro	28d5fe37de	Fix postgres docker-compose integration to 15	2023-10-03 15:26:41 +02:00
Adria Navarro	c84d2449f2	Smarter getValidOperatorsForType	2023-10-03 14:26:12 +02:00
Adria Navarro	b2429e1fe0	Allow selecting many for many-to-many	2023-10-03 14:05:25 +02:00
Adria Navarro	614bbb0412	Handle has any	2023-10-03 13:51:06 +02:00
Adria Navarro	0834d33f9a	Remove none array operators	2023-10-03 13:43:42 +02:00
Adria Navarro	2367ceeb87	Disable when noValue	2023-10-03 13:25:56 +02:00
Adria Navarro	4577ba8239	Change filters	2023-10-03 13:19:28 +02:00
Adria Navarro	f7e92992a8	Fix error	2023-10-03 13:12:50 +02:00
Adria Navarro	0702bc6c33	Sanity filter on change	2023-10-03 13:10:53 +02:00
Adria Navarro	9b14f50e8f	Apply filter	2023-10-03 12:59:15 +02:00
Adria Navarro	3b93748376	Filter user (single) UI	2023-10-03 12:46:06 +02:00
Michael Drury	0220bc3381	Merge branch 'master' into fix/11947	2023-10-03 11:24:12 +01:00
Adria Navarro	af924ae4a2	Use types	2023-10-03 12:01:15 +02:00
melohagan	b291633c79	Don't use DrawerBindableSlot in test modal (#11959)	2023-10-03 10:19:19 +01:00
Peter Clement	eca0089cb9	Merge remote-tracking branch 'origin/develop' into feat/relationship-configuration	2023-10-03 08:44:27 +01:00
Samuel Martineau	84d30e4f4a	Merge branch 'Budibase:develop' into allow-plugins-contribute-datasourceplus	2023-10-02 17:49:34 -04:00
Martin McKeaveney	1e5be5bb96	Merge branch 'develop' into grid-row-click-events	2023-10-02 17:35:38 +01:00
mike12345567	0912720f19	Quick fix for built PKG CLI version, make sure prebuilds are loaded correctly.	2023-10-02 15:43:32 +01:00
Adria Navarro	4389ac0445	Merge branch 'develop' into backmerge-20231002	2023-10-02 15:57:14 +02:00
Adria Navarro	3169962a0a	Merge branch 'master' into BUDI-7500/validation-not-triggering-for-required-foreign-keys	2023-10-02 15:35:26 +02:00
Adria Navarro	2df32b7b28	Use _id if populated	2023-10-02 15:34:26 +02:00
Adria Navarro	3546dfc0cf	Validate	2023-10-02 15:18:28 +02:00
Adria Navarro	0f0b4d3535	Merge branch 'master' into fix/swaggerapi-version	2023-10-02 15:13:19 +02:00
Adria Navarro	aa0ec1c7cb	Fix validating on relationshipType change	2023-10-02 15:12:35 +02:00
Adria Navarro	46c40f011e	Fix multiple relationship display	2023-10-02 15:00:51 +02:00
mike12345567	fc62edf4cc	Fixing swagger API version, updating to use old 3.0.46 as version 3.0.47 does not appear to running correctly.	2023-10-02 13:53:58 +01:00
Adria Navarro	15bec7aae8	Refresh relationships on column link add/edit/delete	2023-10-02 14:51:48 +02:00
Adria Navarro	53236e1039	Add comment	2023-10-02 13:41:07 +02:00
Adria Navarro	ce90109422	Fixing filtering on user column	2023-10-02 13:37:06 +02:00
Adria Navarro	6d59cb2982	Update pro submodule	2023-10-02 13:05:16 +02:00
Adria Navarro	62e1a12fe4	Log errors on retry	2023-10-02 13:01:25 +02:00
melohagan	7003475caf	Refactor FieldSelector to not use BindableSlot (#11942)	2023-10-02 11:42:04 +01:00
Andrew Kingston	7d036ab30d	Move position of grid row click setting	2023-10-02 09:25:59 +01:00
Andrew Kingston	0506adee50	Update row click event name to match best practices	2023-10-02 09:18:25 +01:00
Andrew Kingston	68215684e1	Prevent row selection, deletion and expansion from triggering on click events in grids	2023-10-02 09:13:23 +01:00
Andrew Kingston	3f267be628	Merge branch 'develop' of github.com:Budibase/budibase into grid-row-click-events	2023-10-02 09:08:20 +01:00
Andrew Kingston	0b3b35825a	Merge branch 'develop' into fix/client-initialisation	2023-10-02 08:31:21 +01:00
Andrew Kingston	6b904dd01a	Remove log	2023-10-02 08:27:28 +01:00
Andrew Kingston	bdd70d8bdb	Fix regression when considering empty app navigation roles	2023-10-02 08:26:47 +01:00
Andrew Kingston	986069d7d7	Fix issue causing client apps to initialise 3 times	2023-10-02 08:19:59 +01:00
Martin McKeaveney	b36d728f7a	updating pro ref	2023-10-01 23:45:30 +01:00
Andrew Kingston	eb934adc33	Add row click events to grid	2023-09-29 16:47:53 +01:00
Andrew Kingston	0a1070a4f2	Update grid to support dragging to scroll via touch events	2023-09-29 16:10:16 +01:00
Michael Drury	57ed79ec0f	Merge branch 'develop' into chore/relation_deletions	2023-09-29 15:46:40 +01:00
Adria Navarro	ca8bf5c5ca	Merge branch 'develop' into chore/relation_deletions	2023-09-29 16:39:50 +02:00
Adria Navarro	1a00b60088	Fix tests	2023-09-29 16:39:18 +02:00
Michael Drury	47775aa824	Merge branch 'develop' into fix/BUDI-7084	2023-09-29 15:20:04 +01:00
Adria Navarro	7050c5352a	Check external table types	2023-09-29 16:09:08 +02:00
Adria Navarro	bc6c6b9e80	Handle deleting m2m	2023-09-29 16:02:45 +02:00
melohagan	f22cce9553	Saving pre filled relation picker doesnt work (#11928) ... * Make sure field state is valid * Skip non-object relationship links * Note --------- Co-authored-by: Adria Navarro <adria@budibase.com>	2023-09-29 14:47:07 +01:00
Peter Clement	b5e9a09d22	Merge remote-tracking branch 'origin/develop' into feat/relationship-configuration	2023-09-29 14:31:15 +01:00
Adria Navarro	dfea7f253e	Fix test ds data	2023-09-29 14:58:41 +02:00
Adria Navarro	9d186df018	Don't modify internal API	2023-09-29 14:58:02 +02:00
mike12345567	c498f39f2a	Fixing type build.	2023-09-29 13:45:02 +01:00
mike12345567	5a3ecc3095	Getting create/update response consistent with internal API for external.	2023-09-29 13:40:40 +01:00
mike12345567	3dc7192113	Merge branch 'chore/relation_deletions' of github.com:Budibase/budibase into chore/relation_deletions	2023-09-29 13:34:09 +01:00
mike12345567	45ac9ae06c	Quick update to fix test case.	2023-09-29 13:33:49 +01:00
Adria Navarro	fe45770266	Merge branch 'develop' into chore/relation_deletions	2023-09-29 14:21:08 +02:00
mike12345567	96327eaef1	Quick fix for REST schema being updated by user, when the request is sent again/query performed again user updates are lost - this means that changes are maintained across runs.	2023-09-29 13:17:14 +01:00
Adria Navarro	1f7aa772c9	Add comment	2023-09-29 14:05:52 +02:00
Adria Navarro	c5e52f7cbe	Fix deleting one-2-many relationships	2023-09-29 14:02:45 +02:00
Peter Clement	cb2d7d3915	Merge remote-tracking branch 'origin/develop' into fix/relationship-bug	2023-09-29 11:58:37 +01:00
Peter Clement	ebe8a562f6	fix relationship direction issue	2023-09-29 11:56:50 +01:00
Adria Navarro	17ecace6fa	Fix test	2023-09-29 12:54:16 +02:00
Adria Navarro	711f82099f	Extend bbreference test to check link relationships	2023-09-29 12:48:55 +02:00
Peter Clement	58309739f2	Merge remote-tracking branch 'origin/develop' into feat/relationship-configuration	2023-09-29 11:29:19 +01:00
melohagan	89f7539503	Update automation bindings (#11930) ... * Deprecate zapier+make values1..5 * Allow dates in meeting invite to be bindable * Add DrawerBindableSlot component * Show calendar icon * refactor * Use cancel icon * Disable cancel for JS bindings * WIP * WIP * WIP * Fix linkedIds svelte binding * Label and icon update * Handle arrays * Support text area * Add reactivity to text area icon * Support boolean * JSON support * Remove rowControl * Allow boolean field to have three states * lint * Refactor * Exclude bindings button for formula types --------- Co-authored-by: Michael Drury <me@michaeldrury.co.uk>	2023-09-29 10:12:43 +00:00
Adria Navarro	46a224751f	Types	2023-09-29 11:47:23 +02:00
melohagan	b4e0d98973	Add bindings support to meeting start / end dates (#11759) ... * Deprecate zapier+make values1..5 * Allow dates in meeting invite to be bindable * Add DrawerBindableSlot component * Show calendar icon * refactor * Use cancel icon * Disable cancel for JS bindings * WIP * WIP * WIP * Fix linkedIds svelte binding * Label and icon update * Handle arrays * Support text area * Add reactivity to text area icon * Support boolean * JSON support * Remove rowControl * Allow boolean field to have three states * lint * Refactor --------- Co-authored-by: Michael Drury <me@michaeldrury.co.uk>	2023-09-29 09:15:36 +00:00
Andrew Kingston	647becd52c	Add support for dragging scollbars in grids on mobile	2023-09-29 09:15:58 +01:00
Andrew Kingston	97c08c5327	Copy to clipboard while copying inside grids	2023-09-29 08:50:58 +01:00
Peter Clement	39bed1f419	Merge remote-tracking branch 'origin/develop' into feat/relationship-configuration	2023-09-28 16:45:37 +01:00
Martin McKeaveney	d372396018	Update README.md	2023-09-28 16:41:22 +01:00
Peter Clement	c6442efcab	tidy up	2023-09-28 16:29:45 +01:00
Peter Clement	bcd9357218	Merge remote-tracking branch 'origin/develop' into feat/relationship-configuration	2023-09-28 16:21:45 +01:00
melohagan	80d91cdd92	Make sure field state is valid (#11921)	2023-09-28 16:09:13 +01:00
Peter Clement	ac2c63f9ed	use Relationship selector for external datasource relationships	2023-09-28 16:02:37 +01:00
Adria Navarro	d591776ac8	Merge branch 'develop' into fix-relations-on-ds+	2023-09-28 16:35:54 +02:00
Peter Clement	7e6faaf587	Merge remote-tracking branch 'origin/develop' into feat/relationship-configuration	2023-09-28 15:28:21 +01:00
Adria Navarro	12c57cb51e	Merge branch 'develop' into fix-relations-on-ds+	2023-09-28 15:55:58 +02:00