2590 Commits

Author	SHA1	Message	Date
Adria Navarro	deeba8bae3	Revert "Merge branch 'develop' into master" ... This reverts commit 6f29c978e0, reversing changes made to 1c6ff73c19.	2023-06-06 22:06:34 +01:00
Rory Powell	ad7f6cf5e2	Merge branch 'develop' into merge-master	2023-06-06 11:49:49 +01:00
Adria Navarro	25c921e340	Validate url	2023-06-06 11:29:49 +01:00
Adria Navarro	d4ba73f331	Open continue	2023-06-06 11:29:49 +01:00
Adria Navarro	3a6a3eb8a5	Store tokens in cache and amend redirect	2023-06-06 11:29:49 +01:00
Andrew Kingston	d70e49d74f	Add event for tracking user collaboration	2023-06-06 10:11:51 +01:00
Rory Powell	abbd8c5c8b	Merge branch 'master' into develop	2023-06-05 23:19:43 +01:00
Andrew Kingston	680b70643c	Merge pull request #10775 from Budibase/collaboration-fixes ... Collaboration fixes	2023-06-02 18:03:11 +01:00
mike12345567	c13530ef32	Stop attempt at bundling ioredis-mock, only need to check at runtime.	2023-06-02 13:59:33 +01:00
mike12345567	ddeb25b68d	Updating mock redis to only import if it is needed.	2023-06-02 11:52:50 +01:00
Andrew Kingston	d8d3d71523	Update websocket logic to ignore events trigger by API requests originating from the same session	2023-06-01 17:14:32 +01:00
Michael Drury	13d987023a	Updating ioredis to latest version and removing typing library as no longer required.	2023-06-01 10:39:16 +01:00
Michael Drury	9b23d3ba36	Pinning version of ioredis-mock.	2023-06-01 10:14:30 +01:00
Michael Drury	fde94a262f	Moving ioredis-mock dependency back to dev dependency in backend-core.	2023-06-01 10:13:54 +01:00
Michael Drury	a3f9759a47	Reverting ioredis-mock removal for test cases - will come back to this in future as it currently breaks pro tests.	2023-06-01 00:02:55 +01:00
mike12345567	fba3ec987e	Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-info-endpoint	2023-05-31 17:37:17 +01:00
mike12345567	249625ad1a	Updating backend tests to actually utilise the redis container which is spun up as part of the tests, doing away with the somewhat problematic ioredis-mock which was breaking some tests due to the addition of the changes for multi-dev collab.	2023-05-31 17:18:01 +01:00
Andrew Kingston	8a2d4b7052	Merge branch 'develop' of github.com:Budibase/budibase into websocket-redis-integration	2023-05-31 16:28:14 +01:00
Andrew Kingston	e3b5d711df	Disable redis select command in tests	2023-05-31 16:27:49 +01:00
Andrew Kingston	ffbbf04e86	Lint	2023-05-31 16:08:35 +01:00
Andrew Kingston	05e34076f7	Fully rewrite websocket redis integration to use individual keys per session, enable TTLs on sesisons, prune sessions when users connect and add a heartbeat to sockets	2023-05-31 15:13:22 +01:00
Andrew Kingston	d926650232	Add back in functionality to select different redis DB's per client	2023-05-31 10:52:39 +01:00
Michael Drury	1547280514	Merge pull request #10739 from Budibase/fix/multi-dev-conflicts ... Multidev lock and conflict management	2023-05-30 22:57:00 +01:00
Michael Drury	99607ca06e	Reverting try twice change to writethrough.	2023-05-30 20:45:10 +01:00
Michael Drury	5249148d6c	Updating writethrough test to be aware of the double attempt locks.	2023-05-30 20:20:22 +01:00
mike12345567	7c7bd4d5cb	Fix for debugging with webstorm the old way (if desired), updating the builder middleware to be more multi-dev capable, ignoring 409s when attempting to update the last updated at for apps (if multiple devs hit at same time, only use one) also updating writethrough cache to retry once, with the extended TTL on locks, plus the multi-dev collab it can take a minute to update usage quota doc when a lot of updates occur at once.	2023-05-30 17:41:20 +01:00
Rory Powell	6230e62b9b	Automation investigation logging + max doc size fix for automation log	2023-05-30 16:37:39 +01:00
Andrew Kingston	be40d72f55	Merge pull request #10712 from Budibase/data-section-multidev ... Multiple user collaboration for data section	2023-05-30 09:08:14 +01:00
Adria Navarro	e3ce16d0c9	Update local versions to 0.0.0	2023-05-29 10:54:10 +02:00
Andrew Kingston	5e480a1527	Use socker.io redis adapter to broadcast events to all server instances	2023-05-25 08:48:56 +01:00
Budibase Release Bot	df8e76b153	v2.6.23	2023-05-24 14:26:12 +00:00
Peter Clement	4d5a922684	Merge remote-tracking branch 'origin/develop' into feature/sync-automations	2023-05-24 15:05:58 +01:00
Budibase Release Bot	99b4370a75	v2.6.22	2023-05-24 07:52:24 +00:00
Adria Navarro	f3dc4c320c	Add missing nx scripts	2023-05-23 23:21:47 +02:00
Adria Navarro	c3301e393e	Optimise nx dependencies	2023-05-23 23:11:26 +02:00
mike12345567	22dc37a4ef	Merge branch 'chore/esbuild' of github.com:Budibase/budibase into chore/esbuild	2023-05-23 18:22:06 +01:00
mike12345567	9d3d29f43a	Setting version and adding types dependency to backend-core.	2023-05-23 18:21:47 +01:00
Adria Navarro	8d98a772fc	Fix build order	2023-05-23 19:15:08 +02:00
Budibase Release Bot	eb2984180f	v2.6.21	2023-05-22 12:20:50 +00:00
Peter Clement	d271bbdadb	rename syncWebHooks to syncAutomations	2023-05-19 10:07:02 +01:00
Peter Clement	f680fbd822	Merge remote-tracking branch 'origin/develop' into feature/sync-automations	2023-05-18 11:35:25 +01:00
Budibase Release Bot	ad90dc7713	v2.6.20	2023-05-18 09:54:29 +00:00
Michael Drury	62e9777407	Merge pull request #10633 from Budibase/fix/live-app-user-updates ... Production app user updates	2023-05-18 10:46:31 +01:00
Rory Powell	a685f181da	Merge branch 'master' into develop	2023-05-18 09:10:51 +01:00
Budibase Release Bot	8894f54960	v2.6.19	2023-05-18 07:54:19 +00:00
Rory Powell	55ee94892a	Support setting object name for logged json objects	2023-05-17 22:18:50 +01:00
mike12345567	5fdd7d9076	Fixing an issue with the tenant ID not being found in self host (default) for identification purposes, stopping doc update queue from activating and working as expected.	2023-05-17 19:21:32 +01:00
Budibase Release Bot	30dd224a34	v2.6.18	2023-05-17 16:13:35 +00:00
Budibase Release Bot	e4835d5f91	v2.6.17	2023-05-17 14:39:18 +00:00
Rory Powell	78daed6ec1	Lint	2023-05-17 15:31:14 +01:00