Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0

packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js

@@ -399,18 +399,17 @@ class AvatarEditorBody extends React.Component {
                           isClickable={true}
                           color="#FFFFFF"
                           className="editor-button"
-                          style={{padding: 8}}
                         />
                       </Box>
                       <Box className="zoom-container">
                         <IconButton
+                          className="zoom-container-svg_zoom-minus"
                           size="16"
                           isDisabled={false}
                           onClick={this.onZoomMinusClick}
                           iconName={"/static/images/zoom-minus.react.svg"}
                           isFill={true}
                           isClickable={false}
-                          style={{paddingTop: 20}}
                         />
                         <Slider
                           id="scale"
@@ -424,12 +423,12 @@ class AvatarEditorBody extends React.Component {
                         />
                         <IconButton
                           size="16"
+                          className="zoom-container-svg_zoom-plus"
                           isDisabled={false}
                           onClick={this.onZoomPlusClick}
                           iconName={"/static/images/zoom-plus.react.svg"}
                           isFill={true}
                           isClickable={false}
-                          style={{paddingTop: 20}}
                         />
                       </Box>
                     </Box>

packages/asc-web-components/avatar-editor/sub-components/styled-avatar-editor-body.js

@@ -216,6 +216,9 @@ const mobileStyles = css`
             props.theme.avatarEditorBody.container.button.height};
           border-radius: ${(props) =>
             props.theme.avatarEditorBody.container.button.borderRadius};
+
+          display: flex;
+          align-items: center;
         }
       }
 
@@ -224,6 +227,10 @@ const mobileStyles = css`
           props.theme.avatarEditorBody.container.zoom.mobileHeight};
         margin-top: ${(props) =>
           props.theme.avatarEditorBody.container.zoom.marginTop};
+        .zoom-container-svg_zoom-minus,
+        .zoom-container-svg_zoom-plus {
+          margin: auto 0;
+        }
       }
     }
   }
@@ -299,6 +306,9 @@ const StyledAvatarContainer = styled.div`
         background: ${(props) =>
           props.theme.avatarEditorBody.container.buttons.background};
         justify-items: center;
+        .editor-button {
+          margin: auto 0;
+        }
       }
 
       .zoom-container {
@@ -307,6 +317,10 @@ const StyledAvatarContainer = styled.div`
         display: grid;
         grid-template-columns: min-content 1fr min-content;
         grid-column-gap: 12px;
+        .zoom-container-svg_zoom-minus,
+        .zoom-container-svg_zoom-plus {
+          margin: auto 0;
+        }
       }
     }
   }

products/ASC.People/Client/src/pages/Profile/Section/Header/index.js

@@ -400,8 +400,15 @@ class SectionHeaderContent extends React.PureComponent {
   onClickBack = () => {
     const { filter, setFilter, history, resetProfile } = this.props;
     resetProfile();
-    const backUrl = combineUrl(AppServerConfig.proxyURL, config.homepage);
-    history.push(backUrl);
+
+    const url = filter.toUrlParams();
+    const backUrl = combineUrl(
+      AppServerConfig.proxyURL,
+      config.homepage,
+      `filter?/${url}`
+    );
+
+    history.push(backUrl, url);
     setFilter(filter);
   };
 

web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js

@@ -96,7 +96,7 @@ class ConsumerModalDialog extends React.Component {
       </Box>
       <Text as="div">
         <Trans
-          t={this.pros.t}
+          t={this.props.t}
           i18nKey="ThirdPartyBodyDescription"
           ns="Settings"
         >
@@ -117,7 +117,7 @@ class ConsumerModalDialog extends React.Component {
   );
 
   bottomDescription = (
-    <Trans t={this.pros.t} i18nKey="ThirdPartyBottomDescription" ns="Settings">
+    <Trans t={this.props.t} i18nKey="ThirdPartyBottomDescription" ns="Settings">
       If you still have some questions on how to connect this service or need
       technical assistance, please feel free to contact our{" "}
       <Link