mirror of
https://github.com/hcengineering/platform.git
synced 2025-04-07 00:12:50 +00:00
Merge remote-tracking branch 'origin/develop'
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
commit
d86a6f5bcd
@ -28991,7 +28991,7 @@ packages:
|
|||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
file:projects/pod-server.tgz:
|
file:projects/pod-server.tgz:
|
||||||
resolution: {integrity: sha512-SKYUU6rZD72X+TPRSMr2uaiNrrFE686lm0Ds5ZTObKaPflbXfOua6hR//f4i7YstbNeNMwCTm73OSfkqLsTOXA==, tarball: file:projects/pod-server.tgz}
|
resolution: {integrity: sha512-XTI4qfulSUmxQELlvipQdb6F4i2MG1uBldX7HHP19oBB7fTn85S/qXQols9NOggFWtgIw5ApT2VdQqiJLqmOGQ==, tarball: file:projects/pod-server.tgz}
|
||||||
name: '@rush-temp/pod-server'
|
name: '@rush-temp/pod-server'
|
||||||
version: 0.0.0
|
version: 0.0.0
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -31433,7 +31433,7 @@ packages:
|
|||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
file:projects/server-pipeline.tgz:
|
file:projects/server-pipeline.tgz:
|
||||||
resolution: {integrity: sha512-SmB9+QJy2nEfGizS/BADIxgNsUGf/2T5v08AaDp1gS8FecGNrXwnu8oUUVBmBWVV6n1dEfpGk/CjHYuXC07O3g==, tarball: file:projects/server-pipeline.tgz}
|
resolution: {integrity: sha512-DpU8h5YS6u+d1uVTSyALfcGof3p2hXuSd8f1RyFI/YvNHxLHLrTu0AzquL8uhwxliB1bpNJtCWh1RWphdVJD4Q==, tarball: file:projects/server-pipeline.tgz}
|
||||||
name: '@rush-temp/server-pipeline'
|
name: '@rush-temp/server-pipeline'
|
||||||
version: 0.0.0
|
version: 0.0.0
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -391,6 +391,8 @@
|
|||||||
}
|
}
|
||||||
.hulyHeader-titleGroup {
|
.hulyHeader-titleGroup {
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
|
user-select: text;
|
||||||
|
cursor: auto;
|
||||||
|
|
||||||
&.withDescription { flex-direction: column; }
|
&.withDescription { flex-direction: column; }
|
||||||
&:not(.withDescription) {
|
&:not(.withDescription) {
|
||||||
|
@ -29,15 +29,13 @@
|
|||||||
closeTooltip,
|
closeTooltip,
|
||||||
deviceOptionsStore as deviceInfo,
|
deviceOptionsStore as deviceInfo,
|
||||||
day as getDay,
|
day as getDay,
|
||||||
getEventPositionElement,
|
|
||||||
getMonday,
|
getMonday,
|
||||||
getWeekDayName,
|
getWeekDayName,
|
||||||
resizeObserver,
|
resizeObserver,
|
||||||
showPopup,
|
|
||||||
ticker,
|
ticker,
|
||||||
isWeekend
|
isWeekend
|
||||||
} from '@hcengineering/ui'
|
} from '@hcengineering/ui'
|
||||||
import { Menu, showMenu } from '@hcengineering/view-resources'
|
import { showMenu } from '@hcengineering/view-resources'
|
||||||
import { createEventDispatcher, onDestroy, onMount } from 'svelte'
|
import { createEventDispatcher, onDestroy, onMount } from 'svelte'
|
||||||
import type {
|
import type {
|
||||||
CalendarADGrid,
|
CalendarADGrid,
|
||||||
@ -630,6 +628,7 @@
|
|||||||
function mouseDownElement (e: MouseEvent, event: Event, direction: 'top' | 'bottom'): void {
|
function mouseDownElement (e: MouseEvent, event: Event, direction: 'top' | 'bottom'): void {
|
||||||
if (e.buttons !== 1) return
|
if (e.buttons !== 1) return
|
||||||
e.stopPropagation()
|
e.stopPropagation()
|
||||||
|
closeTooltip()
|
||||||
resizeId = event._id
|
resizeId = event._id
|
||||||
directionResize = direction
|
directionResize = direction
|
||||||
originDate = event.date
|
originDate = event.date
|
||||||
|
@ -27,7 +27,8 @@
|
|||||||
location,
|
location,
|
||||||
navigate,
|
navigate,
|
||||||
showPopup,
|
showPopup,
|
||||||
Scroller
|
Scroller,
|
||||||
|
closePanel
|
||||||
} from '@hcengineering/ui'
|
} from '@hcengineering/ui'
|
||||||
import {
|
import {
|
||||||
ParticipantInfo,
|
ParticipantInfo,
|
||||||
@ -104,6 +105,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function back (): void {
|
function back (): void {
|
||||||
|
closePanel()
|
||||||
const loc = getCurrentLocation()
|
const loc = getCurrentLocation()
|
||||||
loc.path[2] = loveId
|
loc.path[2] = loveId
|
||||||
loc.path.length = 3
|
loc.path.length = 3
|
||||||
|
@ -66,12 +66,6 @@
|
|||||||
"@hcengineering/minio": "^0.6.0",
|
"@hcengineering/minio": "^0.6.0",
|
||||||
"@hcengineering/openai": "^0.6.0",
|
"@hcengineering/openai": "^0.6.0",
|
||||||
"@hcengineering/translate": "^0.6.0",
|
"@hcengineering/translate": "^0.6.0",
|
||||||
"@hcengineering/server-github": "^0.6.0",
|
|
||||||
"@hcengineering/server-github-resources": "^0.6.0",
|
|
||||||
"@hcengineering/github": "^0.6.0",
|
|
||||||
"@hcengineering/github-assets": "^0.6.0",
|
|
||||||
"@hcengineering/server-analytics-collector": "^0.6.0",
|
|
||||||
"@hcengineering/server-analytics-collector-resources": "^0.6.0",
|
|
||||||
"@hcengineering/analytics": "^0.6.0",
|
"@hcengineering/analytics": "^0.6.0",
|
||||||
"@hcengineering/analytics-service": "^0.6.0",
|
"@hcengineering/analytics-service": "^0.6.0",
|
||||||
"@hcengineering/contact": "^0.6.24",
|
"@hcengineering/contact": "^0.6.24",
|
||||||
|
@ -73,6 +73,8 @@
|
|||||||
"@hcengineering/server-tags-resources": "^0.6.0",
|
"@hcengineering/server-tags-resources": "^0.6.0",
|
||||||
"@hcengineering/server-calendar": "^0.6.0",
|
"@hcengineering/server-calendar": "^0.6.0",
|
||||||
"@hcengineering/server-calendar-resources": "^0.6.0",
|
"@hcengineering/server-calendar-resources": "^0.6.0",
|
||||||
|
"@hcengineering/server-github": "^0.6.0",
|
||||||
|
"@hcengineering/server-github-resources": "^0.6.0",
|
||||||
"@hcengineering/server-gmail": "^0.6.0",
|
"@hcengineering/server-gmail": "^0.6.0",
|
||||||
"@hcengineering/server-gmail-resources": "^0.6.0",
|
"@hcengineering/server-gmail-resources": "^0.6.0",
|
||||||
"@hcengineering/server-preference": "^0.6.0",
|
"@hcengineering/server-preference": "^0.6.0",
|
||||||
@ -166,6 +168,8 @@
|
|||||||
"@hcengineering/server-love-resources": "^0.6.0",
|
"@hcengineering/server-love-resources": "^0.6.0",
|
||||||
"@hcengineering/controlled-documents": "^0.1.0",
|
"@hcengineering/controlled-documents": "^0.1.0",
|
||||||
"@hcengineering/products": "^0.1.0",
|
"@hcengineering/products": "^0.1.0",
|
||||||
"@hcengineering/training": "^0.1.0"
|
"@hcengineering/training": "^0.1.0",
|
||||||
|
"@hcengineering/github": "^0.6.0",
|
||||||
|
"@hcengineering/github-assets": "^0.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@ import { contactId } from '@hcengineering/contact'
|
|||||||
import { documentsId } from '@hcengineering/controlled-documents'
|
import { documentsId } from '@hcengineering/controlled-documents'
|
||||||
import { documentId } from '@hcengineering/document'
|
import { documentId } from '@hcengineering/document'
|
||||||
import { driveId } from '@hcengineering/drive'
|
import { driveId } from '@hcengineering/drive'
|
||||||
|
import { githubId } from '@hcengineering/github'
|
||||||
import { gmailId } from '@hcengineering/gmail'
|
import { gmailId } from '@hcengineering/gmail'
|
||||||
import { hrId } from '@hcengineering/hr'
|
import { hrId } from '@hcengineering/hr'
|
||||||
import { inventoryId } from '@hcengineering/inventory'
|
import { inventoryId } from '@hcengineering/inventory'
|
||||||
@ -44,6 +45,7 @@ import contactEn from '@hcengineering/contact-assets/lang/en.json'
|
|||||||
import documentsEn from '@hcengineering/controlled-documents-assets/lang/en.json'
|
import documentsEn from '@hcengineering/controlled-documents-assets/lang/en.json'
|
||||||
import documentEn from '@hcengineering/document-assets/lang/en.json'
|
import documentEn from '@hcengineering/document-assets/lang/en.json'
|
||||||
import driveEn from '@hcengineering/drive-assets/lang/en.json'
|
import driveEn from '@hcengineering/drive-assets/lang/en.json'
|
||||||
|
import githubEn from '@hcengineering/github-assets/lang/en.json'
|
||||||
import gmailEn from '@hcengineering/gmail-assets/lang/en.json'
|
import gmailEn from '@hcengineering/gmail-assets/lang/en.json'
|
||||||
import hrEn from '@hcengineering/hr-assets/lang/en.json'
|
import hrEn from '@hcengineering/hr-assets/lang/en.json'
|
||||||
import inventoryEn from '@hcengineering/inventory-assets/lang/en.json'
|
import inventoryEn from '@hcengineering/inventory-assets/lang/en.json'
|
||||||
@ -100,4 +102,5 @@ export function registerStringLoaders (): void {
|
|||||||
addStringsLoader(documentsId, async (lang: string) => documentsEn)
|
addStringsLoader(documentsId, async (lang: string) => documentsEn)
|
||||||
addStringsLoader(productsId, async (lang: string) => productsEn)
|
addStringsLoader(productsId, async (lang: string) => productsEn)
|
||||||
addStringsLoader(trainingId, async (lang: string) => trainingEn)
|
addStringsLoader(trainingId, async (lang: string) => trainingEn)
|
||||||
|
addStringsLoader(githubId, async (lang: string) => githubEn)
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,7 @@ import { serverContactId } from '@hcengineering/server-contact'
|
|||||||
import { serverDocumentsId } from '@hcengineering/server-controlled-documents'
|
import { serverDocumentsId } from '@hcengineering/server-controlled-documents'
|
||||||
import { serverDocumentId } from '@hcengineering/server-document'
|
import { serverDocumentId } from '@hcengineering/server-document'
|
||||||
import { serverDriveId } from '@hcengineering/server-drive'
|
import { serverDriveId } from '@hcengineering/server-drive'
|
||||||
|
import { serverGithubId } from '@hcengineering/server-github'
|
||||||
import { serverGmailId } from '@hcengineering/server-gmail'
|
import { serverGmailId } from '@hcengineering/server-gmail'
|
||||||
import { serverGuestId } from '@hcengineering/server-guest'
|
import { serverGuestId } from '@hcengineering/server-guest'
|
||||||
import { serverHrId } from '@hcengineering/server-hr'
|
import { serverHrId } from '@hcengineering/server-hr'
|
||||||
@ -55,4 +56,5 @@ export function registerServerPlugins (): void {
|
|||||||
addLocation(serverDriveId, () => import('@hcengineering/server-drive-resources'))
|
addLocation(serverDriveId, () => import('@hcengineering/server-drive-resources'))
|
||||||
addLocation(serverDocumentsId, () => import('@hcengineering/server-controlled-documents-resources'))
|
addLocation(serverDocumentsId, () => import('@hcengineering/server-controlled-documents-resources'))
|
||||||
addLocation(serverTrainingId, () => import('@hcengineering/server-training-resources'))
|
addLocation(serverTrainingId, () => import('@hcengineering/server-training-resources'))
|
||||||
|
addLocation(serverGithubId, () => import('@hcengineering/server-github-resources'))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user