1
0
Fork 0
mirror of synced 2024-09-08 13:41:09 +12:00
Commit graph

23768 commits

Author SHA1 Message Date
Dean
046ef853e3 Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-22 09:06:46 +01:00
Budibase Staging Release Bot
cf1281780d Bump version to 2.9.30-alpha.9 2023-08-21 15:39:36 +00:00
Michael Drury
e0c5772a4b Merge pull request #11555 from Budibase/fix/test-flakiness
Attempt at fixing backend test flakiness
2023-08-21 16:39:17 +01:00
mike12345567
3b19c8410f Comments. 2023-08-21 15:31:35 +01:00
Michael Drury
91e16f7b69 Merge branch 'develop' into fix/test-flakiness 2023-08-21 15:17:02 +01:00
Budibase Staging Release Bot
e5e1be4dd6 Bump version to 2.9.30-alpha.8 2023-08-21 13:20:39 +00:00
Martin McKeaveney
6e9a4b5692 Merge pull request #11551 from Budibase/fix/new-column-popover-fixes
Small UX fixes for new column popover
2023-08-21 14:20:22 +01:00
Martin McKeaveney
8b01531420 Merge branch 'develop' into fix/new-column-popover-fixes 2023-08-21 14:11:48 +01:00
Dean
4c822663e8 Merge remote-tracking branch 'origin/develop' into feature/form-block-ux-updates 2023-08-21 12:50:26 +01:00
Dean
cad624a9a4 Merge Commit 2023-08-21 12:50:16 +01:00
Budibase Staging Release Bot
956c70333b Bump version to 2.9.30-alpha.7 2023-08-21 11:05:08 +00:00
Adria Navarro
cdffb2a784 Merge pull request #11568 from Budibase/chore/fix_fork_checks
Fix build issue with integration tests when running on forks
2023-08-21 14:04:44 +03:00
Adria Navarro
201eae39f3 Fix build issue with integration tests when running on forks 2023-08-21 13:56:33 +03:00
Michael Drury
3c77927fb0 Merge branch 'develop' into fix/test-flakiness 2023-08-21 11:51:42 +01:00
Budibase Staging Release Bot
8db56128d8 Bump version to 2.9.30-alpha.6 2023-08-21 10:00:15 +00:00
Adria Navarro
2f1aa51525 Merge pull request #11494 from Budibase/chore/fix_os_contributor
Fix build when no submodule is loaded
2023-08-21 12:59:54 +03:00
Adria Navarro
5dca30986e Merge branch 'develop' into chore/fix_os_contributor 2023-08-21 10:27:22 +03:00
Adria Navarro
c835f910c5 Fix cli build 2023-08-21 10:20:22 +03:00
Adria Navarro
8ca838dad2 Fix types on shared-pro build 2023-08-21 10:07:36 +03:00
Adria Navarro
05be953647 Shared and types are commonjs (for pro users) 2023-08-21 10:06:37 +03:00
Adria Navarro
ea84b7ffe3 Fix shared-core on dev:builder 2023-08-21 09:54:08 +03:00
Michael Drury
32ebfe2f2b Merge branch 'develop' into fix/test-flakiness 2023-08-18 17:00:27 +01:00
Budibase Staging Release Bot
318b0d4e95 Bump version to 2.9.30-alpha.5 2023-08-18 15:53:50 +00:00
Michael Drury
4ea61140e8 Merge branch 'develop' into fix/test-flakiness 2023-08-18 16:53:44 +01:00
Michael Drury
31cbad4f5a Merge pull request #11529 from Budibase/feature/BUDI-7108
Public API - user roles, admin and builder setting in business/enterprise
2023-08-18 16:53:31 +01:00
Michael Drury
7773299aa4 Merge branch 'develop' into feature/BUDI-7108 2023-08-18 16:18:27 +01:00
Budibase Staging Release Bot
83e3137f9c Bump version to 2.9.30-alpha.4 2023-08-18 14:50:21 +00:00
mike12345567
d492fde27b Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 15:50:18 +01:00
mike12345567
6b2db463aa Fixing issue created by reverting of revert merge. 2023-08-18 15:49:58 +01:00
mike12345567
ef0d4f7c73 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 15:07:36 +01:00
mike12345567
f4ba5c9382 Updating pro reference. 2023-08-18 15:07:01 +01:00
mike12345567
3334be225a Merge branch 'develop' of github.com:Budibase/budibase into fix/test-flakiness 2023-08-18 14:40:46 +01:00
Budibase Staging Release Bot
6bbf80a1d0 Bump version to 2.9.30-alpha.3 2023-08-18 13:40:41 +00:00
mike12345567
c97d3c3e6d Merge branch 'develop' of github.com:Budibase/budibase into develop 2023-08-18 14:40:18 +01:00
mike12345567
188004021a linting. 2023-08-18 14:40:04 +01:00
mike12345567
f154e14414 Merge branch 'develop' of github.com:Budibase/budibase into fix/test-flakiness 2023-08-18 14:35:47 +01:00
mike12345567
a5a1c62eb1 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 14:34:08 +01:00
Budibase Staging Release Bot
d38fe5bc68 Bump version to 2.9.30-alpha.2 2023-08-18 13:33:52 +00:00
mike12345567
7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
mike12345567
3e2010fb26 Attempting to improve on test flakiness, don't depend on a timeout for docker startup, wait for port to respond. 2023-08-18 14:18:47 +01:00
mike12345567
aef7f28ccb Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:30:47 +01:00
Budibase Staging Release Bot
84407ee9c7 Bump version to 2.9.30-alpha.1 2023-08-18 12:30:32 +00:00
Michael Drury
2059c258fa Merge pull request #11548 from Budibase/fix/automation-improvements
Automation improvements
2023-08-18 13:30:12 +01:00
mike12345567
621b1fadea Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:22:34 +01:00
mike12345567
0ac7138e23 Updating pro. 2023-08-18 13:16:59 +01:00
mike12345567
66a94d3857 Quick fix for server tests. 2023-08-18 10:56:13 +01:00
mike12345567
7ed1368b23 Merge branch 'develop' of github.com:Budibase/budibase into fix/automation-improvements 2023-08-18 10:47:44 +01:00
Peter Clement
d8c95fce19 remove log 2023-08-18 09:54:24 +01:00
Peter Clement
11069bacfb Merge remote-tracking branch 'origin/develop' into fix/new-column-popover-fixes 2023-08-18 09:34:27 +01:00
mike12345567
9cfab6fbfd Merge branch 'fix/automation-improvements' of github.com:Budibase/budibase into fix/automation-improvements 2023-08-17 17:45:17 +01:00