Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|
|
|
2007d9b3da
|
Web: People: Changed imports
|
2021-02-24 12:25:18 +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 |
|
TatianaLopaeva
|
782e069ffb
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-23 22:44:44 +03:00 |
|
TatianaLopaeva
|
2b6a0eb9a5
|
Web: Components: Deleted useless imports.
|
2021-02-23 22:43:25 +03:00 |
|
TatianaLopaeva
|
2ee7f60d4c
|
Web/Files: Refactoring.
|
2021-02-23 22:19:51 +03:00 |
|
TatianaLopaeva
|
3e3b079b5a
|
Web: Components: Deleted useless Icons component.
|
2021-02-23 22:14:42 +03:00 |
|
|
|
a586f8fee6
|
Merge pull request #196 from ONLYOFFICE/feature/mobx
Feature/mobx
|
2021-02-23 16:26:16 +03:00 |
|
|
|
846af80668
|
Update react-script and yarn.lock files
|
2021-02-23 15:56:29 +03:00 |
|
|
|
5807e0c402
|
web: common: bump version
|
2021-02-23 12:50:20 +03:00 |
|
|
|
7c4c0bd1ce
|
web: components: bump version
|
2021-02-23 12:49:56 +03:00 |
|
|
|
d270048827
|
Web: Removed commented code
|
2021-02-23 12:46:33 +03:00 |
|
|
|
f5d1b6fc2b
|
Web: Common: Removed redux + fixed storybook start
|
2021-02-23 12:46:01 +03:00 |
|
|
|
ef067c6040
|
Web: Client: Moved translations to public folder
|
2021-02-23 12:10:31 +03:00 |
|
|
|
63584c3cc4
|
Web: Fixed displaying version
|
2021-02-23 12:06:59 +03:00 |
|
|
|
c32a2b64dc
|
Web: Client: Fixed open third-party dialog
|
2021-02-23 12:01:29 +03:00 |
|
|
|
7fc22ca874
|
Web: Fixed cast to boolean
|
2021-02-23 12:00:44 +03:00 |
|
|
|
09a600b042
|
Web: Client: Added config
|
2021-02-23 11:59:24 +03:00 |
|
|
|
b9a8f7b178
|
Web: Common: fixed getting modules
|
2021-02-20 20:17:27 +03:00 |
|
TatianaLopaeva
|
f3efd89bfc
|
Web: Added Setting Routing.
|
2021-02-20 18:41:26 +03:00 |
|
TatianaLopaeva
|
0a75c9240f
|
Web: Components: Refactoring.
|
2021-02-20 18:38:18 +03:00 |
|
TatianaLopaeva
|
5949865a45
|
Web: Components: Fix problem with click om icon, added size style.
|
2021-02-20 18:37:32 +03:00 |
|
TatianaLopaeva
|
5fdb5c8508
|
Web: Fix not displaing of icons.
|
2021-02-20 18:25:46 +03:00 |
|
TatianaLopaeva
|
1d1cbe01af
|
Web: People: Downgrade rc-tree package.
|
2021-02-20 17:54:41 +03:00 |
|
TatianaLopaeva
|
1f8fd0a9db
|
Web: Added styles for icons. Added common icons styles.
|
2021-02-20 17:54:12 +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 |
|
Artem Tarasov
|
98d1fb376d
|
Web: LoginMobile: module moved to experimental
|
2021-02-20 13:41:59 +03:00 |
|
TatianaLopaeva
|
5d26bd5670
|
Web: Downgrade rc-tree package.
|
2021-02-20 13:19:01 +03:00 |
|
Artem Tarasov
|
a0badb257a
|
Web: LoginMobile: fixed condition for empty pass
|
2021-02-20 12:52:54 +03:00 |
|
|
|
dd362f3725
|
Merge pull request #193 from ONLYOFFICE/feature/not-implemented-page
Feature/not implemented page
|
2021-02-20 11:54:01 +03:00 |
|
TatianaLopaeva
|
b625eb3647
|
Web: Home: Revert file changes.
|
2021-02-20 11:53:29 +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 |
|
|
|
a0ce9e0dc5
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-20 11:35:52 +03:00 |
|
TatianaLopaeva
|
30d4c580ac
|
Web: Added ThemeProvider to the App.
|
2021-02-20 10:59:40 +03:00 |
|
TatianaLopaeva
|
b9d0183bfc
|
Web: Components: Checkbox: Modified icons for support color.
|
2021-02-20 10:58:09 +03:00 |
|
TatianaLopaeva
|
80d457234e
|
Web: Components: Added theme support, added color support, moved styles iat another file.
|
2021-02-20 10:51:16 +03:00 |
|
Vladislav Makhov
|
697c6fc8b8
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-20 10:46:33 +03:00 |
|
Artem Tarasov
|
5983dc1e1d
|
Web: LoginMobile: refactoring, added checking value inside Fields
|
2021-02-20 03:04:51 +03:00 |
|
Artem Tarasov
|
e72cfce70e
|
Web: Login/Mobile: added translate
|
2021-02-20 03:03:13 +03:00 |
|
Artem Tarasov
|
c5cac001c8
|
Web: LoginMobile: added validation of pass for registration-form
|
2021-02-20 02:56:59 +03:00 |
|
|
|
87b1108147
|
Web: Turned debug in i18n
|
2021-02-19 21:59:33 +03:00 |
|
|
|
d8bd3f6e7c
|
Web: Files: Simplified translation
|
2021-02-19 21:57:01 +03:00 |
|
|
|
19c7104d3d
|
Web: Removed useless dev packages + fixed warnings of building
|
2021-02-19 20:51:44 +03:00 |
|
|
|
85a500eac6
|
Web: Client: Simplified translation
|
2021-02-19 20:26:41 +03:00 |
|
Artem Tarasov
|
1c42ea4165
|
Web: LoginMobile: refactoring fields
|
2021-02-19 20:14:54 +03:00 |
|
Artem Tarasov
|
993384c781
|
Web: LoginMobile: added RegistrationForm
|
2021-02-19 20:13:39 +03:00 |
|
|
|
d2e46c396f
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 19:27:23 +03:00 |
|
|
|
e97ba3a8b3
|
Web: People: Simplified translation
|
2021-02-19 19:27:13 +03:00 |
|
