Commit Graph

23794 Commits

Author SHA1 Message Date
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
mike12345567 ba5e390b3f Quick PR comments. 2023-08-17 17:44:59 +01:00
Budibase Staging Release Bot d32e9d58a0 Bump version to 2.9.30-alpha.0 2023-08-17 16:35:15 +00:00
Michael Drury df31fb1b8d Merge branch 'develop' into fix/automation-improvements 2023-08-17 17:35:02 +01:00
mike12345567 e174211440 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-17 17:34:44 +01:00
Martin McKeaveney b170b77a3f Merge pull request #11541 from Budibase/fix/add-offline-to-compose
adding offline mode to .env
2023-08-17 17:14:38 +01:00
mike12345567 4c6c0f3002 Quick fix based on tests. 2023-08-17 16:51:11 +01:00
mike12345567 95b8a4ea10 Adding feature flagging, the option to only start the automations, or the API, meaning we can split the service if needed. 2023-08-17 16:39:25 +01:00
Budibase Staging Release Bot fce22c0751 Bump version to 2.9.26-alpha.4 2023-08-17 12:32:10 +00:00
melohagan b57a8c1130 Move when filter empty option into filter drawer (#11262)
* Add when filter empty dropdown

* Add unit tests

* "fix" typescript issue

* Add empty filter check for external

* Add unit test

* Hide empty filter option for custom query

* Make onEmptyFilter optional

* Fix unit tests

* Remove onEmptyFilter automation input

* Remove unused var

* Refactor

* Fix path

* Fix type issue

* Fix types
2023-08-17 13:31:52 +01:00
Budibase Staging Release Bot 5d3a16c8c1 Bump version to 2.9.29 2023-08-17 10:57:42 +00:00
Martin McKeaveney 5f4fb81967 Merge branch 'master' of github.com:Budibase/budibase 2023-08-17 11:57:19 +01:00
Martin McKeaveney 39f31b90a4 update pro reference 2023-08-17 11:57:05 +01:00