Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
This commit is contained in:
commit
9762e4eaca
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "docspace",
|
||||
"version": "1.2.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"workspaces": {
|
||||
"packages": [
|
||||
@ -8,7 +8,7 @@
|
||||
]
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14",
|
||||
"node": ">=18",
|
||||
"yarn": ">=3"
|
||||
},
|
||||
"scripts": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@docspace/client",
|
||||
"version": "1.2.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"homepage": "",
|
||||
"scripts": {
|
||||
|
@ -123,7 +123,6 @@
|
||||
"NewColorScheme": "New color scheme",
|
||||
"PasswordMinLenght": "Minimal password length",
|
||||
"Path": "Path",
|
||||
"Payments": "Payments",
|
||||
"PleaseNote": "Please note",
|
||||
"PleaseNoteDescription": "<0>{{pleaseNote}}</0>: your old space address will become available to new users once you click the <2>{{save}}</2> button.",
|
||||
"Plugins": "Plugins",
|
||||
|
@ -122,7 +122,6 @@
|
||||
"NewColorScheme": "Новая цветовая схема",
|
||||
"PasswordMinLenght": "Минимальная длина пароля",
|
||||
"Path": "Путь",
|
||||
"Payments": "Платежи",
|
||||
"PleaseNote": "Пожалуйста, обратите внимание",
|
||||
"PleaseNoteDescription": "<0>{{pleaseNote}}</0>: ваш старый адрес портала станет доступен для новых пользователей, как только вы нажмете кнопку <2>{{save}}</2>.",
|
||||
"Plugins": "Плагины",
|
||||
|
@ -52,7 +52,7 @@ const getTreeItems = (data, path, t) => {
|
||||
case "PortalDeletion":
|
||||
return t("PortalDeletion");
|
||||
case "Payments":
|
||||
return t("Payments");
|
||||
return t("Common:PaymentsTitle");
|
||||
case "SingleSignOn":
|
||||
return t("SingleSignOn");
|
||||
case "DeveloperTools":
|
||||
@ -223,7 +223,7 @@ class ArticleBodyContent extends React.Component {
|
||||
case "Backup":
|
||||
return t("Backup");
|
||||
case "Payments":
|
||||
return t("Payments");
|
||||
return t("Common:PaymentsTitle");
|
||||
case "ManagementCategoryDataManagement":
|
||||
return t("ManagementCategoryDataManagement");
|
||||
case "RestoreBackup":
|
||||
|
@ -23,7 +23,7 @@ import {
|
||||
} from "SRC_DIR/components/dialogs";
|
||||
|
||||
import { StyledWrapper, StyledInfo } from "./styled-main-profile";
|
||||
import { HelpButton } from "@docspace/components";
|
||||
import { HelpButton, Tooltip } from "@docspace/components";
|
||||
|
||||
const MainProfile = (props) => {
|
||||
const { t } = useTranslation(["Profile", "Common"]);
|
||||
@ -93,12 +93,24 @@ const MainProfile = (props) => {
|
||||
<div className="email-container">
|
||||
<div className="email-edit-container">
|
||||
<Text
|
||||
data-for="emailTooltip"
|
||||
data-tip={t("EmailNotVerified")}
|
||||
as="div"
|
||||
className={"email-text-container"}
|
||||
fontWeight={600}
|
||||
>
|
||||
{profile.email}
|
||||
</Text>
|
||||
{withActivationBar && (
|
||||
<Tooltip
|
||||
id="emailTooltip"
|
||||
getContent={(dataTip) => (
|
||||
<Text fontSize="12px">{dataTip}</Text>
|
||||
)}
|
||||
effect="float"
|
||||
place="bottom"
|
||||
/>
|
||||
)}
|
||||
|
||||
<IconButton
|
||||
className="edit-button email-edit-button"
|
||||
|
@ -183,6 +183,7 @@ export const StyledInfo = styled.div`
|
||||
|
||||
.email-edit-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-right: 16px;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@docspace/common",
|
||||
"version": "1.2.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"build": "echo 'skip it'",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@docspace/components",
|
||||
"version": "1.2.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"build": "echo 'skip it'",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@docspace/editor",
|
||||
"version": "1.2.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"homepage": "/doceditor",
|
||||
"scripts": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@docspace/login",
|
||||
"version": "1.2.0",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"homepage": "/login",
|
||||
"scripts": {
|
||||
|
@ -83,10 +83,6 @@ public class WhitelabelController : BaseSettingsController
|
||||
foreach (var l in inDto.Logo)
|
||||
{
|
||||
var key = Int32.Parse(l.Key);
|
||||
if (key == (int)WhiteLabelLogoTypeEnum.Favicon && !(l.Value.Light.EndsWith("ico") || l.Value.Light.EndsWith("svg")))
|
||||
{
|
||||
throw new InvalidOperationException("Favicon must have .ico or .svg extension");
|
||||
}
|
||||
|
||||
logoDict.Add(key, new KeyValuePair<string, string>(l.Value.Light, l.Value.Dark));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user