wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-22 15:38:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/hcengineering/platform into staging-new

Browse Source 
Signed-off-by: Artem Savchenko <armisav@gmail.com>
This commit is contained in:
Artem Savchenko 2025-05-16 11:41:01 +07:00
commit 13d200a2a4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/presentation/src/components/extensions/ComponentExtensions.svelte
View File

@ -19,5 +19,5 @@
</script> </script>
{#each extensions as extension} {#each extensions as extension}
<Component is={extension.component} showLoading={false} props={{ ...extension.props, ...props }} on:open /> <Component is={extension.component} showLoading={false} props={{ ...extension.props, ...props }} on:open on:close />
{/each} {/each}

2
plugins/media-resources/src/components/MediaPopup.svelte
View File

@ -51,7 +51,7 @@
</script> </script>
<div class="antiPopup mediaPopup"> <div class="antiPopup mediaPopup">
<ComponentExtensions extension={media.extension.StateContext} /> <ComponentExtensions extension={media.extension.StateContext} on:close />
<div class="ap-scroll"> <div class="ap-scroll">
<div class="ap-box"> <div class="ap-box">

2
services/mail/pod-inbound-mail/src/client.ts
View File

@ -21,7 +21,7 @@ import { getClient } from '@hcengineering/kvs-client'
import config from './config' import config from './config'
// TODO: Find account UUID from mailboxes and use personal workspace // TODO: Find account UUID from mailboxes and use personal workspace
export const mailServiceToken = generateToken(systemAccountUuid, undefined, { service: 'mail' }) export const mailServiceToken = generateToken(systemAccountUuid, undefined, { service: 'mail' }, config.secret)
export const baseConfig: BaseConfig = { export const baseConfig: BaseConfig = {
AccountsURL: config.accountsUrl, AccountsURL: config.accountsUrl,
KvsUrl: config.kvsUrl, KvsUrl: config.kvsUrl,