Commit Graph

25697 Commits

Author SHA1 Message Date
Sam Rose 3fc2ff2c9b
Put pro back to where it was. 2023-10-23 10:36:05 +01:00
Sam Rose 2e0b528331
Update pro submodule. 2023-10-23 09:59:27 +01:00
Sam Rose 2d26597d07
Fix tests after merge. 2023-10-23 09:49:57 +01:00
Sam Rose a563cf3594
Merge master. 2023-10-23 09:39:34 +01:00
Budibase Staging Release Bot 97fc794a2b Bump version to 2.11.41 2023-10-20 15:15:17 +00:00
Adria Navarro 58af4832df
Merge pull request #12137 from Budibase/update-pro-ref
Update pro submodule ref
2023-10-20 17:09:53 +02:00
Adria Navarro 13a8b20ea9
Merge branch 'master' into update-pro-ref 2023-10-20 17:04:04 +02:00
Michael Drury de7dcce498
Merge pull request #12136 from Budibase/fix/BUDI-7637-allow-basic-users-query-users
Make user search allow basic users, so that can be used in apps
2023-10-20 16:03:55 +01:00
Adria Navarro 8a939dd3e6 Update pro submodule ref 2023-10-20 17:02:24 +02:00
mike12345567 8c744ea7a9 PR comments. 2023-10-20 15:57:45 +01:00
mike12345567 04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Budibase Staging Release Bot 0010e07b47 Bump version to 2.11.40 2023-10-20 13:29:13 +00:00
Adria Navarro 431f683a0a
Merge pull request #12129 from Budibase/clean-pipeline
CI fixes and tweaks
2023-10-20 15:24:35 +02:00
Adria Navarro 5cc3141999
Merge pull request #12130 from Budibase/fix-single-image-docker
Fixing single image docker
2023-10-20 15:17:27 +02:00
Adria Navarro 2d1e01998a Use nx affected on PRs 2023-10-20 15:16:48 +02:00
Adria Navarro 36a33bc192 Use nx affected on PRs 2023-10-20 15:15:52 +02:00
Adria Navarro e5aefa83ec Fix single image dockerfile 2023-10-20 15:13:29 +02:00
Adria Navarro 70f6f861d0 Clean pipeline 2023-10-20 15:09:45 +02:00
Adria Navarro 91b7994ee0
Merge branch 'master' into clean-pipeline 2023-10-20 15:05:03 +02:00
Michael Drury 89d6486ba0
Merge pull request #12127 from Budibase/fix/12121-datasource-error-stopping-creation
Datasource errors blocking full creation steps
2023-10-20 13:14:44 +01:00
Michael Drury dbf5a9caaa
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 13:04:14 +01:00
Adria Navarro f136512184 Clean pipeline 2023-10-20 14:03:43 +02:00
Adria Navarro 90cdda7cea
Merge pull request #12126 from Budibase/BUDI-7641/push_v2_images_to_qa
Push QA on master commit
2023-10-20 14:02:39 +02:00
Adria Navarro ab169c270d
Merge branch 'master' into BUDI-7641/push_v2_images_to_qa 2023-10-20 13:50:58 +02:00
Adria Navarro 91e4a47a72
Merge pull request #12128 from Budibase/chore/redure-nx-cloud-usage
Reduce nx cloud usage
2023-10-20 13:50:01 +02:00
Michael Drury 8e76618a85
Merge branch 'master' into fix/12121-datasource-error-stopping-creation 2023-10-20 12:45:18 +01:00
Adria Navarro 1b3ba9a402 Don't use nx cloud on ci 2023-10-20 13:32:54 +02:00
Adria Navarro 1478ef503a Don't use nx cloud locally 2023-10-20 13:31:50 +02:00
Michael Drury 2462076586
Merge pull request #12107 from Budibase/fix/couchdb-image-build
Fix budibase/couchdb multi-arch build
2023-10-20 12:26:29 +01:00
Michael Drury 86b9556b0e
Merge branch 'master' into fix/couchdb-image-build 2023-10-20 12:23:22 +01:00
mike12345567 bc8e84b815 Fixing datasource error states causing a datasource to fail to be built fully - this was simply a frontend issue of the error not being handled on creation. 2023-10-20 12:19:04 +01:00
Andrew Kingston 8d56849cdc
Merge pull request #12007 from Budibase/grid-all-datasources
Grid support for all datasource types + custom datasources
2023-10-20 12:04:54 +01:00
Andrew Kingston 940801d8ea
Merge branch 'master' into grid-all-datasources 2023-10-20 11:54:42 +01:00
Adria Navarro 281348295d
Merge branch 'master' into BUDI-7641/push_v2_images_to_qa 2023-10-20 12:40:56 +02:00
Adria Navarro e701bd2b89 Ref name in master 2023-10-20 12:38:52 +02:00
Adria Navarro 0176b8f31e
Merge pull request #12106 from Budibase/BUDI-7641/remove-npm-from-apps-worker-docker
Remove npm dependency from apps and worker docker images
2023-10-20 12:30:39 +02:00
Michael Drury 5f485e772f
Merge branch 'master' into fix/couchdb-image-build 2023-10-20 11:29:57 +01:00
Andrew Kingston db286d431a Fix dependsOn logic for gridblock after renaming setting key 2023-10-20 11:20:14 +01:00
Andrew Kingston fa90629139 Improve grid datasource backwards compatibility 2023-10-20 11:14:24 +01:00
Andrew Kingston 7fd7943a5a Remove required prop from gridblock to ensure backwards compatiblity 2023-10-20 11:07:37 +01:00
Andrew Kingston 452dc92356 Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-20 10:41:08 +01:00
Adria Navarro 65fea6d680 Fix branch name 2023-10-20 10:44:24 +02:00
Adria Navarro c5b37ae0c7 Push 2023-10-20 10:42:45 +02:00
Adria Navarro d9e9f36985 test 2023-10-20 10:38:01 +02:00
Adria Navarro ec76388de4 Use event v2 2023-10-20 10:37:22 +02:00
Adria Navarro c462b07224 Create deploy qa workflow 2023-10-20 10:34:38 +02:00
Adria Navarro 806685014b
Merge branch 'master' into BUDI-7641/remove-npm-from-apps-worker-docker 2023-10-20 10:07:33 +02:00
Adria Navarro 6b68e52836 Use v2 dockerfiles 2023-10-20 10:02:18 +02:00
Michael Drury 525898a93c
Merge pull request #12118 from Budibase/fix/cla-bot
Disable CLA bot on non-master PR merges
2023-10-19 18:21:17 +01:00
Michael Drury ab740e4e63
Merge branch 'master' into fix/couchdb-image-build 2023-10-19 18:01:27 +01:00