Skip to content

Commit c3054c1

Browse files
committed
Merge remote-tracking branch 'origin/devel' into devel
2 parents 20b129d + a08b9c2 commit c3054c1

5 files changed

Lines changed: 2 additions & 40 deletions

File tree

webapp/packages/core-links/src/WebsiteLinks.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export const WEBSITE_LINKS = {
3737
LATEST_COMMUNITY_VERSION_PAGE: 'https://dbeaver.com/product/cloudbeaver-ce-version.json',
3838
TEAM_ARCHIVE: 'https://dbeaver.com/downloads-team',
3939
CONTACT_PAGE: 'https://dbeaver.com/contact/',
40-
TECH_SUPPORT_PAGE: 'https://dbeaver.com/tickets/',
4140

4241
getTeamArchiveById(id: string): string {
4342
return `${WEBSITE_LINKS.TEAM_ARCHIVE}/${id}`;

webapp/packages/core-support/src/GeneralSupportInstruction.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

webapp/packages/core-support/src/GeneralSupportInstructionLazy.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* CloudBeaver - Cloud Database Manager
3-
* Copyright (C) 2020-2025 DBeaver Corp and others
3+
* Copyright (C) 2020-2026 DBeaver Corp and others
44
*
55
* Licensed under the Apache License, Version 2.0.
66
* you may not use this file except in compliance with the License.
@@ -9,4 +9,3 @@
99
import './module.js';
1010

1111
export * from './SupportService.js';
12-
export * from './GeneralSupportInstructionLazy.js';

webapp/packages/plugin-administration/src/Administration/Administration.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export const Administration = observer<React.PropsWithChildren<Props>>(function
117117
/>
118118
))}
119119

120-
{SupportInstruction && (
120+
{!configurationWizard && SupportInstruction && (
121121
<div className="tw:mt-auto tw:p-2">
122122
<SupportInstruction />
123123
</div>

0 commit comments

Comments
 (0)