Commit Graph

30201 Commits

Author SHA1 Message Date
Budibase Staging Release Bot 0fe6804290 Bump version to 2.22.13 2024-03-28 16:49:13 +00:00
Martin McKeaveney 424ce16481
Merge pull request #13371 from Budibase/feature/update-global-user
[Added] POST /api/global/users/sso endpoint
2024-03-28 16:25:33 +00:00
Martin McKeaveney a7722bccc0 fix worker test 2024-03-28 16:18:51 +00:00
Martin McKeaveney 32a5ce24ec remove automatic ssoId generation 2024-03-28 15:46:43 +00:00
José Vte. Calderón 267d187e41
Merge branch 'master' into feature/update-global-user 2024-03-28 16:12:17 +01:00
Michael Drury f9e78652bb
Merge pull request #13372 from Budibase/fix/better-datasource-defaults
Better datasource default hosts
2024-03-28 15:09:42 +00:00
mike12345567 d8de0a3154 An issue which comes up relatively often is that localhost is not a valid option for a datasource in our cloud and our self host environments. Fixing this so it only shows this in development. 2024-03-28 12:14:56 +00:00
José Vte. Calderón b5e0bd1aad
Merge branch 'master' into feature/update-global-user 2024-03-28 12:05:29 +01:00
jvcalderon af2407e8cd Lint 2024-03-28 12:04:27 +01:00
jvcalderon b77106480e Adds POST /api/global/users/sso endpoint 2024-03-28 11:46:58 +01:00
Michael Drury 5814274ed5
Merge pull request #13368 from Budibase/fix/account-portal-build
Split build for account portal/monorepo
2024-03-27 18:03:09 +00:00
mike12345567 84f87c4a48 Updating CI. 2024-03-27 17:00:56 +00:00
mike12345567 9f80d7fe43 Adding a mechanism to split build of account portal and monorepo. 2024-03-27 16:59:45 +00:00
Adria Navarro 91aa90d094
Merge pull request #13364 from Budibase/ci/ignore-merge-commits-on-submodule-checks
Ignore merge conflicts on pro submodule checks
2024-03-27 15:44:47 +01:00
Adria Navarro 5b55b9f569
Merge branch 'master' into ci/ignore-merge-commits-on-submodule-checks 2024-03-27 15:40:15 +01:00
Adria Navarro 0c89759e58
Merge pull request #13363 from Budibase/fix/account-portal-submodule
[Changed] Update portal submodule
2024-03-27 15:33:57 +01:00
mike12345567 e4d2ac4fc2 Changing build back. 2024-03-27 14:25:14 +00:00
mike12345567 4d6ceb142a Updating account portal reference. 2024-03-27 14:00:43 +00:00
mike12345567 936762c8ee Removing all eval warnings from rollup. 2024-03-27 13:35:47 +00:00
mike12345567 cd694cb312 Disabling warnings for eval (required). 2024-03-27 13:32:24 +00:00
mike12345567 77621f87b6 Adding missing package from ignore. 2024-03-27 13:15:02 +00:00
mike12345567 84516e85a1 Updating to latest account portal master. 2024-03-27 13:00:02 +00:00
mike12345567 2427936b70 Build in CI in two steps, one for account portal and one for OSS/monorepo. 2024-03-27 12:59:29 +00:00
mike12345567 81ef8033dd Trying an earlier account portal reference. 2024-03-27 12:41:17 +00:00
mike12345567 36fa7b75de Removing yarn version set - made no difference. 2024-03-27 12:24:03 +00:00
mike12345567 e36ec14163 Use yarn 1.22.19 across all CI steps. 2024-03-27 12:05:44 +00:00
mike12345567 4fa98f17d2 Different way to set yarn version. 2024-03-27 11:55:22 +00:00
mike12345567 1e7608a790 Trying yarn 1.22.19. 2024-03-27 11:46:45 +00:00
Adria Navarro ab46a3e5e8 Update submodule 2024-03-27 12:41:05 +01:00
Adria Navarro 4493905e74 Update submodule 2024-03-27 12:39:20 +01:00
Adria Navarro 1ed687f6c4 Fix checks 2024-03-27 12:37:07 +01:00
Adria Navarro 36ffab32ef
Merge branch 'master' into ci/ignore-merge-commits-on-submodule-checks 2024-03-27 12:28:55 +01:00
Adria Navarro 89d9b787df Rename 2024-03-27 12:26:10 +01:00
Adria Navarro c255c70954 cd 2024-03-27 12:25:37 +01:00
Adria Navarro 4fb6217730 Fix checks 2024-03-27 12:24:16 +01:00
Adria Navarro 02e2d26985 Fix 2024-03-27 12:20:07 +01:00
Adria Navarro 5939a3f4f1 Ignore merge conflicts on pro submodule checks 2024-03-27 12:15:30 +01:00
José Vte. Calderón b3189bbf9b
Merge branch 'master' into fix/account-portal-submodule 2024-03-27 11:59:50 +01:00
Adria Navarro e3259ece23
Merge pull request #13362 from Budibase/ci/ignore-merge-commits-on-submodule-checks
Runs submodule checks only if you changed the submodule ref
2024-03-27 11:58:01 +01:00
Adria Navarro 962c6aeb4e
Merge branch 'master' into ci/ignore-merge-commits-on-submodule-checks 2024-03-27 11:52:14 +01:00
Adria Navarro 2998bf094a Undo changes 2024-03-27 11:48:46 +01:00
Adria Navarro 7938c00664 Submodule not latest 2024-03-27 11:46:51 +01:00
José Vte. Calderón bb4ced613d
Merge branch 'master' into fix/account-portal-submodule 2024-03-27 11:44:46 +01:00
Adria Navarro f1dfc16e1c Fix 2024-03-27 11:44:32 +01:00
Adria Navarro e0bb5f323f Update submodule 2024-03-27 11:41:02 +01:00
Adria Navarro d3fdf4add8 Runs checks only if you changed it 2024-03-27 11:37:13 +01:00
jvcalderon 0f170b6601 Update submodule 2024-03-27 11:32:08 +01:00
jvcalderon 37e99cc80e Empty commit 2024-03-27 11:28:09 +01:00
Andrew Kingston acb21027a4
Merge pull request #13355 from Budibase/fix/skeleton-colours
Fix issues with colours in app skeletons
2024-03-27 10:24:02 +00:00
Andrew Kingston 0a4eddc7dc Try reverting account portal 2024-03-27 10:20:22 +00:00