MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master.

This commit is contained in:
Sam Rose 2024-09-26 10:54:30 +01:00
parent 43265bf1ea 075be10f44
commit b93e6cb986
No known key found for this signature in database
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,6 +1,6 @@
{ {
"$schema": "node_modules/lerna/schemas/lerna-schema.json", "$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "2.32.7", "version": "2.32.8",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

2
packages/account-portal

@ -1 +1 @@
Subproject commit c24374879d2b61516fabc24d7404e7da235be05e Subproject commit afe53b4be55ac6f93dc9486596835412b2673f90

2
packages/backend-core/src/features/index.ts
View File

@ -3,6 +3,7 @@ import * as context from "../context"
import { PostHog, PostHogOptions } from "posthog-node" import { PostHog, PostHogOptions } from "posthog-node"
import { FeatureFlag, IdentityType, UserCtx } from "@budibase/types" import { FeatureFlag, IdentityType, UserCtx } from "@budibase/types"
import tracer from "dd-trace" import tracer from "dd-trace"
import { Duration } from "../utils"
let posthog: PostHog | undefined let posthog: PostHog | undefined
export function init(opts?: PostHogOptions) { export function init(opts?: PostHogOptions) {
@ -16,6 +17,7 @@ export function init(opts?: PostHogOptions) {
posthog = new PostHog(env.POSTHOG_TOKEN, { posthog = new PostHog(env.POSTHOG_TOKEN, {
host: env.POSTHOG_API_HOST, host: env.POSTHOG_API_HOST,
personalApiKey: env.POSTHOG_PERSONAL_TOKEN, personalApiKey: env.POSTHOG_PERSONAL_TOKEN,
featureFlagsPollingInterval: Duration.fromMinutes(3).toMs(),
...opts, ...opts,
}) })
} else { } else {

5
packages/bbui/src/Form/Core/Dropzone.svelte
View File

@ -396,6 +396,11 @@
padding: 6px 10px; padding: 6px 10px;
margin-bottom: 8px; margin-bottom: 8px;
} }
.compact .placeholder {
height: fit-content;
}
.title { .title {
display: flex; display: flex;
flex-direction: row; flex-direction: row;