Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

2023-03-13 11:45:30 +03:00 · 2023-03-13 11:45:30 +03:00 · 9762e4eaca
commit 9762e4eaca
parent 2fee97df3d 805f258e97
12 changed files with 23 additions and 16 deletions
--- a/package.json
+++ b/package.json
@ -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": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/client",
-  "version": "1.2.0",
+  "version": "1.0.0",
  "private": true,
  "homepage": "",
  "scripts": {
--- a/packages/client/public/locales/en/Settings.json
+++ b/packages/client/public/locales/en/Settings.json
@ -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",
--- a/packages/client/public/locales/ru/Settings.json
+++ b/packages/client/public/locales/ru/Settings.json
@ -122,7 +122,6 @@
  "NewColorScheme": "Новая цветовая схема",
  "PasswordMinLenght": "Минимальная длина пароля",
  "Path": "Путь",
-  "Payments": "Платежи",
  "PleaseNote": "Пожалуйста, обратите внимание",
  "PleaseNoteDescription": "<0>{{pleaseNote}}</0>: ваш старый адрес портала станет доступен для новых пользователей, как только вы нажмете кнопку <2>{{save}}</2>.",
  "Plugins": "Плагины",
--- a/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
+++ b/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
@ -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":
--- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
+++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
@ -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"
--- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js
+++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js
@ -183,6 +183,7 @@ export const StyledInfo = styled.div`

    .email-edit-container {
      display: flex;
+      align-items: center;
      padding-right: 16px;
    }

--- a/packages/common/package.json
+++ b/packages/common/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/common",
-  "version": "1.2.0",
+  "version": "1.0.0",
  "private": true,
  "scripts": {
    "build": "echo 'skip it'",
--- a/packages/components/package.json
+++ b/packages/components/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/components",
-  "version": "1.2.0",
+  "version": "1.0.0",
  "private": true,
  "scripts": {
    "build": "echo 'skip it'",
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/editor",
-  "version": "1.2.0",
+  "version": "1.0.0",
  "private": true,
  "homepage": "/doceditor",
  "scripts": {
--- a/packages/login/package.json
+++ b/packages/login/package.json
@ -1,6 +1,6 @@
 {
  "name": "@docspace/login",
-  "version": "1.2.0",
+  "version": "1.0.0",
  "private": true,
  "homepage": "/login",
  "scripts": {
--- a/web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
+++ b/web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
@ -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));
            }