Commit Graph

90 Commits

Author SHA1 Message Date
124ea0aa5c Web: Client: fixed translates 2021-05-14 13:58:21 +03:00
71b69c3560 Web: Client: fixed after merge 2021-04-28 11:42:12 +03:00
0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Profile.json
#	products/ASC.People/Client/public/locales/ru/Profile.json
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/public/locales/en/Confirm.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Confirm.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-26 15:57:19 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
TatianaLopaeva
0f3eb1350b Merge branch 'develop' into feature/team-template
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
Viktor Fomin
56e61a028c Web: Client: add fake qr-code 2021-04-19 14:01:29 +03:00
Viktor Fomin
e5906324c5 Web: Client: fixed key 2021-04-19 13:49:36 +03:00
Viktor Fomin
62edc883db Web: Client: add translations 2021-04-18 23:34:26 +03:00
Alexey Kostenko
d7930f9a8b Web: Client: Redesign access rights page 2021-04-16 12:19:19 +03:00
TatianaLopaeva
e738cab4a2 Web: Added Error message & Added loader. 2021-04-15 19:51:59 +03:00
Viktor Fomin
dd4ca59e66 Web: Client: add translations 2021-04-14 15:23:03 +03:00
Viktor Fomin
f76ebe4095 Web: Client: added access portal page 2021-04-14 13:01:56 +03:00
TatianaLopaeva
73d113e26f Wen: Settings: Added translation. 2021-04-13 14:28:36 +03:00
Alexey Kostenko
571b412d27 Web: Client/Components: Fixed facebook button styles/icon, fixed translations 2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1 Web: Client/Components: Style fix and added translations 2021-04-13 09:45:52 +03:00
TatianaLopaeva
3b94348cf5 Web: Settings: Fixed translation. 2021-04-12 15:59:20 +03:00
TatianaLopaeva
8c7ec5d0d0 Web: Settings: Added team template to the settings tree. 2021-04-12 14:34:08 +03:00
TatianaLopaeva
91bd2c8c74 Web: Settings: Added team-template page. 2021-04-12 12:56:08 +03:00
b9fe2c338f Added New Proxy settings 2021-04-05 15:49:02 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
8e6b2c78d8 Web: Moved ipl-progress-indicator to NavMenu 2021-03-18 22:26:52 +03:00
f3f4037282 Web: Fixed Wizard 2021-03-18 21:54:03 +03:00
6e2b2d5095 Web: Removed old svg 2021-03-17 21:26:28 +03:00
Artem Tarasov
c9e4df5f1b Web: moved PeopleSelector to People 2021-03-17 13:37:22 +03:00
bac65c6744 Web: Client: Modified production build 2021-03-10 18:31:21 +03:00
TatianaLopaeva
5412f7b860 Web: NavMenu: Fixed icon path, deleted useless icons from modules. 2021-03-05 11:09:23 +03:00
TatianaLopaeva
e81d2c8bb7 Web: Common: Fixed logoUrl. 2021-03-05 11:01:49 +03:00
TatianaLopaeva
5c826bcf29 Web: Added top loading indicator for desktop. 2021-03-04 14:36:31 +03:00
68930abdcb Web: Move toastr function to Web Client (mf: "studio/toastr") 2021-03-03 16:46:04 +03:00
TatianaLopaeva
ada47512f1 Web: Moved PeopleSelector to the Web Client. 2021-03-03 15:41:28 +03:00
TatianaLopaeva
5212633a8d Web: Moved errors from Common to the Web Client. 2021-03-03 11:15:11 +03:00
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00
b9b4c4b1e2 Web: Added opportunity to load login page by primary link 2021-03-01 15:28:51 +03:00
55a4a53bbc Web: Fixed 404 error on translation.json loading 2021-02-25 12:25:16 +03:00
507fadff55 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	packages/asc-web-components/src/components/icons/svg/index.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	yarn.lock
2021-02-24 10:57:03 +03:00
34d9eed580 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
#	packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
#	packages/asc-web-common/src/store/AuthStore.js
#	packages/asc-web-common/src/store/ModuleStore.js
#	packages/asc-web-common/src/store/SettingsStore.js
#	packages/asc-web-common/src/store/UserStore.js
#	packages/asc-web-common/src/store/auth/actions.js
#	packages/asc-web-common/src/store/auth/index.js
#	packages/asc-web-common/src/store/auth/reducer.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	products/ASC.Files/Client/config-overrides.js
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/Article/Header/index.js
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
#	products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
#	products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
#	products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
#	products/ASC.Files/Client/src/helpers/desktop.js
#	products/ASC.Files/Client/src/helpers/i18n.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	products/ASC.Files/Client/src/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/rootReducer.js
#	products/ASC.People/Client/config-overrides.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/Article/Header/index.js
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
#	products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
#	products/ASC.People/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Reassign/index.js
#	products/ASC.People/Client/src/helpers/i18n.js
#	products/ASC.People/Client/src/helpers/utils.js
#	products/ASC.People/Client/src/index.js
#	products/ASC.People/Client/src/store/people/reducers.js
#	products/ASC.People/Client/src/store/portal/actions.js
#	products/ASC.People/Client/src/store/portal/reducers.js
#	products/ASC.People/Client/src/store/profile/actions.js
#	products/ASC.People/Client/src/store/profile/selectors.js
#	products/ASC.People/Client/src/store/rootReducer.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/config-overrides.js
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/About/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
#	web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
#	web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/src/helpers/confirmRoute.js
#	web/ASC.Web.Client/src/helpers/i18n.js
#	web/ASC.Web.Client/src/helpers/utils.js
#	web/ASC.Web.Client/src/index.js
#	web/ASC.Web.Client/src/store/confirm/actions.js
#	web/ASC.Web.Client/src/store/payments/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Client/src/store/settings/selectors.js
#	web/ASC.Web.Client/src/store/store.js
#	web/ASC.Web.Client/src/store/wizard/actions.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	web/ASC.Web.Login/src/Login.jsx
#	web/ASC.Web.Login/src/sub-components/register-container.js
#	yarn.lock
2021-02-24 10:30:42 +03:00
ef067c6040 Web: Client: Moved translations to public folder 2021-02-23 12:10:31 +03:00
TatianaLopaeva
5fdb5c8508 Web: Fix not displaing of icons. 2021-02-20 18:25:46 +03:00
6c80ebdff0 Merge branch 'develop' into feature/mobx
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	products/ASC.People/Client/src/store/group/actions.js
#	products/ASC.People/Client/src/store/people/actions.js
#	products/ASC.People/Client/src/store/people/selectors.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/About/index.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
#	web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
TatianaLopaeva
7023cf5f3a Web: Transferring icons from a shared folder to modules. Icons are displayed by url. 2021-02-20 11:46:32 +03:00
85a500eac6 Web: Client: Simplified translation 2021-02-19 20:26:41 +03:00
Ilya Oleshko
e486a7919a Web: Fixed modules icons 2021-01-25 14:28:51 +03:00
789b547ccf Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-22 11:24:16 +03:00
ef22eb04c5 Web: Client: Fix third-party response page displaying 2021-01-15 18:15:07 +03:00
889949eb95 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-common/src/desktop/index.js
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/helpers/confirmRoute.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/i18n.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	web/ASC.Web.Login/src/LoginContent.jsx
#	yarn.lock
2021-01-11 12:21:59 +03:00
Vladislav Makhov
44ba6f350f Merge branch 'develop' into feature/desktop-view 2020-12-30 16:20:47 +03:00
Artem Tarasov
3d7eada1a6 Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation 2020-12-30 12:15:50 +03:00
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +03:00
52798af66e Notification images 2020-12-18 16:12:48 +03:00
4afadf2e0c Web: Added support of public folders + moved back to original index.html 2020-12-15 19:27:30 +03:00