Commit Graph

26892 Commits

Author SHA1 Message Date
Michael Drury afc7892562
Merge branch 'master' into fix-deployment-instability 2023-12-06 11:48:17 +00:00
Sam Rose e736403cee
Merge pull request #12504 from Budibase/fix-typo-in-helm-readme
Fix a small typo in the example values.yaml file.
2023-12-06 11:05:46 +00:00
Sam Rose d1f6747166
Merge branch 'master' into fix-typo-in-helm-readme 2023-12-06 11:02:06 +00:00
Sam Rose 480d48b4ec
Merge branch 'master' into fix-deployment-instability 2023-12-06 11:01:46 +00:00
Sam Rose 4ed2cbb58b
Merge pull request #12508 from Budibase/nginx-metrics
Expose /nginx_status on the proxy image for DataDog collection.
2023-12-06 11:01:33 +00:00
Sam Rose 79819795c1
Merge branch 'master' into fix-deployment-instability 2023-12-06 10:09:17 +00:00
Sam Rose 72d2b57e5d
Expose /nginx_status on the proxy image for DataDog collection. 2023-12-06 09:48:27 +00:00
Peter Clement 5cef7c8009
Merge pull request #12440 from Budibase/fix/pc-bug-fixes
Automations UI tweaks / fixes
2023-12-05 16:36:27 +00:00
Peter Clement ee9937d3d8 Merge remote-tracking branch 'origin/master' into fix/pc-bug-fixes 2023-12-05 16:32:24 +00:00
Andrew Kingston 0147afbd5a
Merge pull request #12427 from Budibase/feature/add-buttongroup-to-formblock
Add Buttongroup configuration support to Formblock/Tableblock
2023-12-05 15:17:50 +00:00
Andrew Kingston a384956d29
Merge branch 'master' into feature/add-buttongroup-to-formblock 2023-12-05 15:13:17 +00:00
Gerard Burns 7ef09b6fec
Fix Deleting and Remaking Relationships to the User Table (#12453)
* Fix Deleting and Remaking Relationships to the User Table

* change tables store related tables fetching

* lint
2023-12-05 15:01:35 +00:00
Sam Rose cbdac03d75
Fix a small typo in the example values.yaml file. 2023-12-05 14:54:29 +00:00
Peter Clement 442d0853d3 fix plus icon colour and hover 2023-12-05 14:37:49 +00:00
Peter Clement 0f3f484953 Merge remote-tracking branch 'origin/master' into fix/pc-bug-fixes 2023-12-05 09:55:20 +00:00
Michael Drury 864fe6be68
Merge pull request #12500 from Budibase/fix/BUDI-7811
Cross tenant app denial
2023-12-04 17:17:46 +00:00
Dean 79bc945fb7 Merge remote-tracking branch 'origin/master' into feature/add-buttongroup-to-formblock 2023-12-04 17:15:16 +00:00
Dean 2e3b65ca4f PR feedback 2023-12-04 17:14:00 +00:00
Michael Drury c321c83916
Update packages/server/src/middleware/currentapp.ts
Co-authored-by: Sam Rose <hello@samwho.dev>
2023-12-04 17:10:19 +00:00
mike12345567 a7410020c7 Adding cookie clearing/logout for when a cross tenant session is detected, make sure that the cookie cannot be used/considered valid after the call is made. 2023-12-04 16:47:41 +00:00
Peter Clement f6b5c32207 Merge remote-tracking branch 'origin/master' into fix/pc-bug-fixes 2023-12-04 15:41:12 +00:00
Peter Clement 96e9f46d7c pr comments 2023-12-04 14:21:35 +00:00
Peter Clement 0ddbe4483f Merge remote-tracking branch 'origin/master' into fix/pc-bug-fixes 2023-12-04 14:21:20 +00:00
Adria Navarro 661735a3fd
Merge pull request #12497 from Budibase/chore/fix-typing-conflicting-in-account-portal
[Chore] Remove conflicting typing
2023-12-04 15:21:16 +01:00
Adria Navarro e4237c0620 Remove conflicting typing 2023-12-04 15:15:40 +01:00
Budibase Staging Release Bot 1c0976b97a Bump version to 2.13.31 2023-12-04 12:31:05 +00:00
Sam Rose f81cd8646b
Merge pull request #12416 from Budibase/budi-7754-make-our-helm-chart-work-out-of-the-box
Make our helm chart work out of the box
2023-12-04 11:52:32 +00:00
Sam Rose 98ae0014a8
Respond to PR comments. 2023-12-04 11:47:11 +00:00
Sam Rose 030cdba5d3
Merge branch 'master' into budi-7754-make-our-helm-chart-work-out-of-the-box 2023-12-04 10:49:08 +00:00
Andrew Kingston de3d6700ed
Merge branch 'master' into feature/add-buttongroup-to-formblock 2023-12-04 10:19:10 +00:00
Adria Navarro 50c1ba4ca9
Merge pull request #12486 from Budibase/BUDI-7655/create_migration_context_functions
Create migration context functions
2023-12-04 09:30:24 +01:00
Adria Navarro 083ff0b7c7 Fix tests typing 2023-12-04 09:23:01 +01:00
Adria Navarro 188d5d09a2 Typo
Co-authored-by: Sam Rose <hello@samwho.dev>
2023-12-04 09:12:58 +01:00
Adria Navarro fa7693f6df Typo
Co-authored-by: Sam Rose <hello@samwho.dev>
2023-12-04 09:12:58 +01:00
Adria Navarro 7f52a1e28c Guard migration 2023-12-04 09:12:58 +01:00
Adria Navarro 14fc91d58a Add tests 2023-12-04 09:12:58 +01:00
Adria Navarro f62dd56dd6 Add doInAppMigrationContext 2023-12-04 09:12:58 +01:00
Adria Navarro fe0efc7539 Remove unused test context code 2023-12-04 09:12:57 +01:00
Sam Rose f776499970
Add minReadySeconds: 10 to the proxy deployment to give nginx time to properly start. 2023-12-01 16:00:37 +00:00
Sam Rose bd5d7c3b65
Merge master. 2023-12-01 14:02:01 +00:00
melohagan fcb862c82f
Prevent stale bot using default 60 days (#12488) 2023-12-01 14:00:56 +00:00
Budibase Staging Release Bot 19266b4770 Bump version to 2.13.30 2023-12-01 11:18:49 +00:00
Budibase Staging Release Bot 527f96814b Bump version to 2.13.29 2023-12-01 10:39:50 +00:00
Dean a6df68d63f Merge remote-tracking branch 'origin/master' into feature/add-buttongroup-to-formblock 2023-12-01 09:03:22 +00:00
Adria Navarro 28466a89ac
Merge pull request #12474 from Budibase/chore/allow_redis_without_ttl
Smart locking mechanism for redis locks without TTL
2023-11-30 18:47:23 +01:00
Adria Navarro 12015c79ae Add comments 2023-11-30 18:39:33 +01:00
Adria Navarro 670853a0ea Renames 2023-11-30 18:39:33 +01:00
Adria Navarro fb72b77ac1 Use jest.useFakeTimers 2023-11-30 18:39:33 +01:00
Adria Navarro bd89633e61 Fix wrong commited code 2023-11-30 18:39:33 +01:00
Adria Navarro a8ac4eed6d Autoextend without ttl 2023-11-30 18:39:33 +01:00