|
|
63fec5b296
|
Web: Files: fixed download action
|
2021-03-04 16:53:16 +03:00 |
|
|
|
c655622794
|
Web: Files: added files actions store
|
2021-03-04 15:43:53 +03:00 |
|
|
|
3b93ba28de
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 15:42:52 +03:00 |
|
|
|
b93928948d
|
Web: Files: fixed header delete action
|
2021-03-04 15:42:41 +03:00 |
|
TatianaLopaeva
|
249ea4ed7b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 14:37:01 +03:00 |
|
TatianaLopaeva
|
5c826bcf29
|
Web: Added top loading indicator for desktop.
|
2021-03-04 14:36:31 +03:00 |
|
|
|
cc9a904dc2
|
Web: Files: fix
|
2021-03-04 13:23:48 +03:00 |
|
|
|
7cec3df259
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 12:33:06 +03:00 |
|
|
|
c35ed454af
|
Web: Files: fixed files context menu actions
|
2021-03-04 12:32:53 +03:00 |
|
Vladislav Makhov
|
22c7dcb414
|
web: people: refactoring
|
2021-03-03 19:11:12 +03:00 |
|
|
|
8c936e3ce0
|
Web: Styling
|
2021-03-03 18:21:06 +03:00 |
|
|
|
47a030f5a1
|
Web: Restored process indication in Files
|
2021-03-03 17:58:56 +03:00 |
|
|
|
8e1d5fb0b4
|
Web: webpack: changed devtool
|
2021-03-03 17:58:16 +03:00 |
|
|
|
68930abdcb
|
Web: Move toastr function to Web Client (mf: "studio/toastr")
|
2021-03-03 16:46:04 +03:00 |
|
TatianaLopaeva
|
17ac53d015
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 15:42:58 +03:00 |
|
TatianaLopaeva
|
ada47512f1
|
Web: Moved PeopleSelector to the Web Client.
|
2021-03-03 15:41:28 +03:00 |
|
Vladislav Makhov
|
34c1816aa5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 14:54:37 +03:00 |
|
Vladislav Makhov
|
57609a6e7e
|
web: people: ProfileAction refactoring
|
2021-03-03 14:54:26 +03:00 |
|
|
|
238914e25e
|
Web: Files: refactoring
|
2021-03-03 13:22:50 +03:00 |
|
Vladislav Makhov
|
1dbfd7f105
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 12:33:25 +03:00 |
|
Vladislav Makhov
|
d2dd11ef91
|
web: people: isMe refactoring
|
2021-03-03 12:33:17 +03:00 |
|
TatianaLopaeva
|
90831adc31
|
Web: Moved GroupSelector to the People module.
|
2021-03-03 12:09:12 +03:00 |
|
Vladislav Makhov
|
b8702eb270
|
web: people: add isMe
|
2021-03-03 12:05:34 +03:00 |
|
Vladislav Makhov
|
c2a5eea4be
|
web: people: refactoring
|
2021-03-03 12:05:08 +03:00 |
|
TatianaLopaeva
|
5212633a8d
|
Web: Moved errors from Common to the Web Client.
|
2021-03-03 11:15:11 +03:00 |
|
Vladislav Makhov
|
756039eccd
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 09:33:53 +03:00 |
|
|
|
bf7f680d08
|
Web: Moved NavMenu to Web Client
|
2021-03-02 18:25:20 +03:00 |
|
Vladislav Makhov
|
bb81b97df2
|
web: people: add missing prop
|
2021-03-02 16:36:45 +03:00 |
|
|
|
df8d922b9a
|
Web: People: refactoring
|
2021-03-02 15:44:14 +03:00 |
|
|
|
3ce638b69a
|
Web: People: Simplified People Home page (fixed render issues)
|
2021-03-02 15:11:17 +03:00 |
|
|
|
c304bbe8b7
|
Web: People: Fixed displaying user list
|
2021-03-02 11:06:34 +03:00 |
|
|
|
94708ed455
|
Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy
|
2021-03-01 22:48:48 +03:00 |
|
|
|
8a6afa8111
|
Web: Fixed load source maps
|
2021-03-01 18:21:40 +03:00 |
|
|
|
27ba8efeb3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 17:01:02 +03:00 |
|
|
|
79cb70bc1f
|
Web: Added opportunity to load people page by primary link
|
2021-03-01 17:00:54 +03:00 |
|
|
|
0cf1150288
|
Web: Added opportunity to load files page by primary link
|
2021-03-01 16:29:37 +03:00 |
|
Ilya Oleshko
|
0c1689bec5
|
Bump version to v0.0.10
|
2021-03-01 16:27:21 +03:00 |
|
Vladislav Makhov
|
47004a1e1d
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# packages/asc-web-components/input-block/index.js
|
2021-03-01 16:12:34 +03:00 |
|
Vladislav Makhov
|
f452b09ecd
|
web: fix icons
|
2021-03-01 16:11:45 +03:00 |
|
|
|
09d330104b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 15:03:21 +03:00 |
|
|
|
1cfb03810e
|
Web: Added imports
|
2021-03-01 15:03:13 +03:00 |
|
|
|
d66f299f87
|
Web: Files: fixed mobx warnings
|
2021-03-01 14:43:19 +03:00 |
|
|
|
f734a91d82
|
Files: fix SaveEditing
|
2021-03-01 14:38:55 +03:00 |
|
|
|
7339fec101
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 14:16:47 +03:00 |
|
|
|
e6aeaac4a5
|
Web: Files: decomposed the settings store object
|
2021-03-01 14:16:37 +03:00 |
|
Vladislav Makhov
|
603db877b5
|
web: people: fix import
|
2021-03-01 12:30:33 +03:00 |
|
Vladislav Makhov
|
628916a1c1
|
web: people: fix svg import
|
2021-03-01 11:56:11 +03:00 |
|
TatianaLopaeva
|
b8fabd5de0
|
Update webpack.config for fix displaying of icons.
|
2021-02-28 21:59:50 +03:00 |
|
TatianaLopaeva
|
5ac0124640
|
Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons.
|
2021-02-28 21:39:50 +03:00 |
|
TatianaLopaeva
|
1e266d6fc8
|
Web: Files: Fix not displaying icon at actions.
|
2021-02-28 21:24:13 +03:00 |
|
Vladislav Makhov
|
7bf2a8e9b5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-26 18:33:28 +03:00 |
|
|
|
7852dac3ca
|
Files: fix saveediting
|
2021-02-26 17:07:08 +03:00 |
|
|
|
f357c8b78c
|
Web: fixed icons for files module
|
2021-02-26 16:29:50 +03:00 |
|
Vladislav Makhov
|
ae45d875f6
|
web: people: fix group fetching
|
2021-02-26 15:53:06 +03:00 |
|
|
|
a2ace1a012
|
Web: People: Fix opening
|
2021-02-26 13:06:59 +03:00 |
|
|
|
96c4d63abe
|
Web: Fixed Files opening + added devtool: "inline-source-map"
|
2021-02-26 12:02:54 +03:00 |
|
Artem Tarasov
|
f10d8ae11d
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-26 00:20:24 +03:00 |
|
Artem Tarasov
|
904813031b
|
Web; People/Files/Login: fix imports
|
2021-02-26 00:19:04 +03:00 |
|
|
|
dccbe81002
|
DataAnnotations: fix
|
2021-02-25 21:18:27 +03:00 |
|
TatianaLopaeva
|
99ef717815
|
Web: Files: Fix url for common icons.
|
2021-02-25 19:12:39 +03:00 |
|
TatianaLopaeva
|
b7fc7dd523
|
Web: Files: Fix tree-folder icons.
|
2021-02-25 19:03:36 +03:00 |
|
Artem Tarasov
|
c35d0612f0
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
|
2021-02-25 18:42:10 +03:00 |
|
Artem Tarasov
|
15602c3a8f
|
Web: Files: fix after merge
|
2021-02-25 18:41:06 +03:00 |
|
TatianaLopaeva
|
ab93fac698
|
Web: Files: Fix icons size.
|
2021-02-25 18:30:31 +03:00 |
|
|
|
933a1aec48
|
Web: Files: fixed tree menu
|
2021-02-25 18:03:54 +03:00 |
|
Artem Tarasov
|
9b27d51ac5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
|
2021-02-25 17:57:32 +03:00 |
|
|
|
8b962cd88d
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 17:20:19 +03:00 |
|
Artem Tarasov
|
48b3c6b445
|
Web: Common: fix after merge, fix imports and hierarchy
|
2021-02-25 17:20:11 +03:00 |
|
|
|
b4fa1b2bb1
|
Web: Files: fixed icons imports, fixed components imports, fixed files module
|
2021-02-25 17:20:06 +03:00 |
|
Artem Tarasov
|
69ed46e8ae
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
|
2021-02-25 15:27:36 +03:00 |
|
Artem Tarasov
|
989fba5ecc
|
Web: applied new import from appserver/common
|
2021-02-25 15:22:53 +03:00 |
|
Vladislav Makhov
|
e91bb64d03
|
web: people: fix imports
|
2021-02-25 15:16:52 +03:00 |
|
|
|
b25dd2d6e2
|
.net 5
|
2021-02-25 12:02:28 +03:00 |
|
Diana
|
f1091f409a
|
fix dataannotations
|
2021-02-25 12:00:53 +03:00 |
|
|
|
4a40c8f894
|
Fix dependencies
|
2021-02-25 10:29:57 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
|
|
38a00bdd7d
|
Merge branch 'develop' into feature/dataannotations
|
2021-02-24 15:38:34 +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
|
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 |
|
|
|
846af80668
|
Update react-script and yarn.lock files
|
2021-02-23 15:56:29 +03:00 |
|
|
|
d270048827
|
Web: Removed commented code
|
2021-02-23 12:46:33 +03:00 |
|
Diana
|
4ddd2cebec
|
delete dataannotations
|
2021-02-20 22:02:12 +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 |
|
TatianaLopaeva
|
5d26bd5670
|
Web: Downgrade rc-tree package.
|
2021-02-20 13:19:01 +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 |
|
Vladislav Makhov
|
697c6fc8b8
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-20 10:46:33 +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 |
|
|
|
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 |
|
Vladislav Makhov
|
a7208bf244
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 16:08:39 +03:00 |
|
Vladislav Makhov
|
0b1f8cb22d
|
web: people: change prop to primitive value
|
2021-02-19 16:05:20 +03:00 |
|
|
|
7e32c26241
|
Files: fixed tests
|
2021-02-19 14:52:29 +03:00 |
|
|
|
3f35977864
|
Web: Files: fixed Header rerender
|
2021-02-19 13:22:38 +03:00 |
|
|
|
faae49a0e1
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 12:21:19 +03:00 |
|
|
|
e2cc45d1d1
|
Web: Files: fixed Home component rerender
|
2021-02-19 12:21:09 +03:00 |
|
Ilya Oleshko
|
cb72f2241b
|
Web: Added product version badge
|
2021-02-18 15:55:26 +03:00 |
|
Vladislav Makhov
|
753d1472b7
|
web: people: hide unused props
|
2021-02-18 15:15:14 +03:00 |
|
Vladislav Makhov
|
474fe57466
|
web: people: remove console.log
|
2021-02-18 13:24:34 +03:00 |
|
|
|
47d8405a01
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 12:55:46 +03:00 |
|
|
|
a59ffc0a81
|
Web: Enabled wdy in People and Files
|
2021-02-18 12:55:37 +03:00 |
|
|
|
64c65a4a41
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 12:24:28 +03:00 |
|
|
|
561c82bccf
|
Web: Files: fixed files empty screen
|
2021-02-18 12:24:06 +03:00 |
|
Vladislav Makhov
|
f452ae2eae
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 11:52:13 +03:00 |
|
Vladislav Makhov
|
855fd46560
|
web: people: return to set selected mechanism in group button menu
|
2021-02-18 11:52:03 +03:00 |
|
|
|
6e29fce81b
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 11:23:21 +03:00 |
|
|
|
d81b0fd770
|
Web: Files: fixed treeFolders
|
2021-02-18 11:23:03 +03:00 |
|
Vladislav Makhov
|
f5cf3683f4
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 19:22:12 +03:00 |
|
Vladislav Makhov
|
da0d039be7
|
web: people: remove console.log
|
2021-02-17 19:22:04 +03:00 |
|
|
|
fbde2ee6f8
|
Web: Files: move from redux to mobx
|
2021-02-17 18:35:04 +03:00 |
|
|
|
3b659a31f5
|
Web: Files: fixed files creation
|
2021-02-17 18:07:09 +03:00 |
|
|
|
ca166e3c66
|
Web: People: Move from redux to mobx completely
|
2021-02-17 17:53:18 +03:00 |
|
Vladislav Makhov
|
4029233d32
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 12:46:32 +03:00 |
|
Vladislav Makhov
|
98ab4973ae
|
web: people: hide unused code
|
2021-02-17 12:46:21 +03:00 |
|
Vladislav Makhov
|
1042506645
|
web: people: hide unused code
|
2021-02-17 12:30:55 +03:00 |
|
Vladislav Makhov
|
8d4994cb40
|
web: people: add getters
|
2021-02-17 12:30:36 +03:00 |
|
|
|
1ddcca5ed3
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 11:20:18 +03:00 |
|
|
|
de57a61c59
|
Web: Files: refactoring
|
2021-02-17 11:20:08 +03:00 |
|
Vladislav Makhov
|
4d0fbe8903
|
web: people: add missing observable dependencies in storages
|
2021-02-16 18:11:18 +03:00 |
|
Vladislav Makhov
|
15c80ae139
|
web: people: init refactoring
|
2021-02-16 17:42:33 +03:00 |
|
Vladislav Makhov
|
cb9dbff58f
|
web: people: fix callback param
|
2021-02-16 17:13:26 +03:00 |
|
Vladislav Makhov
|
a683c53735
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-16 16:52:02 +03:00 |
|
|
|
7e86c680e3
|
Web: Files: added files uploader
|
2021-02-16 16:48:04 +03:00 |
|
Ilya Oleshko
|
d204c9b6de
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-16 13:22:34 +03:00 |
|
|
|
52c9e4daac
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Header/index.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/panels/NewFilesPanel/index.js
|
2021-02-16 12:16:13 +03:00 |
|
Vladislav Makhov
|
1d7f8c2e97
|
web: people: fix editing form data injection
|
2021-02-16 12:13:19 +03:00 |
|
|
|
a1fc390bc2
|
Web: Files: created formatsStore
|
2021-02-16 12:01:51 +03:00 |
|
Vladislav Makhov
|
c5ad94e358
|
resolve merge conflicts
|
2021-02-16 10:27:53 +03:00 |
|
Vladislav Makhov
|
09c580e268
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# 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/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/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
|
2021-02-16 10:20:43 +03:00 |
|
Vladislav Makhov
|
e513ad35c9
|
web: people: hide unused code
|
2021-02-16 10:01:01 +03:00 |
|
Vladislav Makhov
|
86faaad05f
|
web: people: add is People admin getter
|
2021-02-16 10:00:35 +03:00 |
|
Vladislav Makhov
|
702351dbdd
|
web: people: add several func's
|
2021-02-16 09:59:56 +03:00 |
|
Vladislav Makhov
|
9db00e24ae
|
web: people: group button menu fix
|
2021-02-16 09:53:52 +03:00 |
|
|
|
722e04b458
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# 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/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/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/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/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/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
|
2021-02-15 23:03:15 +03:00 |
|
|
|
0b9a258f91
|
Web: Client: Moved to MobX
|
2021-02-15 22:43:07 +03:00 |
|
Vladislav Makhov
|
38dffc62ad
|
web: people: migrate data to mobx
|
2021-02-15 19:56:35 +03:00 |
|
Vladislav Makhov
|
5946e5b157
|
web: people: remove unused code
|
2021-02-15 18:47:17 +03:00 |
|
|
|
b37ee479e1
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-15 18:36:16 +03:00 |
|
|
|
d7647f6271
|
Web: Files: removed settings from FilesStore
|
2021-02-15 18:36:07 +03:00 |
|
Vladislav Makhov
|
ead67641a1
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-15 18:26:31 +03:00 |
|
Vladislav Makhov
|
9f20de7496
|
web: people: migrate data to mobx
|
2021-02-15 18:26:17 +03:00 |
|
Artem Tarasov
|
3414ebc986
|
Web: People: dialogs/DeleteProfileEverDialog: removed anonymous function creation
|
2021-02-15 15:26:56 +03:00 |
|
|
|
42f5401a29
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-15 15:11:45 +03:00 |
|
|
|
68910bfa04
|
Web: Files: removed redux provider from files
|
2021-02-15 15:11:26 +03:00 |
|
Vladislav Makhov
|
aeeac1cc47
|
web: people: migrate data to mobx
|
2021-02-15 12:55:51 +03:00 |
|
Vladislav Makhov
|
be2813304e
|
web: people: hide unused code
|
2021-02-15 12:55:35 +03:00 |
|
Vladislav Makhov
|
0712360025
|
web: people: hide unused code
|
2021-02-15 12:55:17 +03:00 |
|
Vladislav Makhov
|
8827e6b8e2
|
web: people: migrate dialogues data to mobx
|
2021-02-15 12:53:50 +03:00 |
|
Vladislav Makhov
|
93b34f1150
|
web: people: migrate profile data to mobx
|
2021-02-15 12:52:29 +03:00 |
|
Vladislav Makhov
|
048da06f6e
|
web: people: add func's to AvatarEditorStore
|
2021-02-15 12:51:37 +03:00 |
|
Vladislav Makhov
|
94ff0f7dd8
|
web: people: InviteLinksStore init, add SetisLoading action
|
2021-02-15 12:51:10 +03:00 |
|
Vladislav Makhov
|
1c4df51ed3
|
web: people: update getTargetUser func
|
2021-02-15 12:50:29 +03:00 |
|
Vladislav Makhov
|
caa2388c34
|
web: people: add setUsers, update updateProfileInUsers func's
|
2021-02-15 12:49:49 +03:00 |
|
Vladislav Makhov
|
926ead6d6b
|
web: people: hide unused code
|
2021-02-15 12:48:46 +03:00 |
|
Vladislav Makhov
|
eb0f8bd208
|
web: people: add Invite Links Store
|
2021-02-15 12:48:08 +03:00 |
|
Ilya Oleshko
|
f2f2fbc07c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-15 10:58:34 +03:00 |
|
Artem Tarasov
|
134cb7f0ed
|
Web: People: GroupAction/helpers: added to helpers/constants.js user id if there is no manager in the group
|
2021-02-12 18:12:44 +03:00 |
|
Artem Tarasov
|
0533163c78
|
Web: People: Home: deleted unnecessary code
|
2021-02-12 16:04:51 +03:00 |
|
Artem Tarasov
|
1ddc2c951a
|
Merge branch 'develop' into feature/empty-group
# Conflicts:
# web/ASC.Web.Common/package.json
|
2021-02-12 13:10:41 +03:00 |
|
Vladislav Makhov
|
0782f72943
|
web: people: remove unused code
|
2021-02-12 10:30:03 +03:00 |
|
Vladislav Makhov
|
fa4c0bafa3
|
web: people: migrate update user type action to mobx
|
2021-02-12 10:29:46 +03:00 |
|
Vladislav Makhov
|
4e3a2e024c
|
web: people: add group actions
|
2021-02-12 10:29:17 +03:00 |
|
Vladislav Makhov
|
ce65fd1059
|
web: people: fix setIsVisibleDataLossDialog
|
2021-02-12 10:28:46 +03:00 |
|
Vladislav Makhov
|
483a671dec
|
web: people: add stores, fix actions observes
|
2021-02-12 10:28:12 +03:00 |
|
Vladislav Makhov
|
27bec2e4b0
|
web: people: migrate group actions to mobx
|
2021-02-12 10:27:10 +03:00 |
|
Vladislav Makhov
|
d36ca5706d
|
web: people: hide unused code
|
2021-02-12 10:26:06 +03:00 |
|
Vladislav Makhov
|
654dee30c5
|
web: people: refactoring, fix actions
|
2021-02-12 10:25:24 +03:00 |
|
Vladislav Makhov
|
b9111b2689
|
web: people: add Avatar Editor Store
|
2021-02-12 10:23:27 +03:00 |
|
Artem Tarasov
|
480ddc15cd
|
Web: People: GroupAction: fixed signature if no manager assigned to the group
|
2021-02-11 17:28:39 +03:00 |
|
Vladislav Makhov
|
bf2da1322e
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-10 20:24:43 +03:00 |
|
Vladislav Makhov
|
4c797137f8
|
web: people: comment out setSelected
|
2021-02-10 20:24:31 +03:00 |
|
Vladislav Makhov
|
ea61a9a056
|
web: people: migrate removeUser to mobx, comment out setSelected
|
2021-02-10 20:24:11 +03:00 |
|
Vladislav Makhov
|
56b00ffc9d
|
web: people: migrate updateUserStatus to mobx, comment out setSelected
|
2021-02-10 20:23:28 +03:00 |
|
Vladislav Makhov
|
a22d9f333d
|
web: people: migrate actions to mobx
|
2021-02-10 20:22:12 +03:00 |
|
Vladislav Makhov
|
60407b74d4
|
web: people: migrate setFilter to mobx
|
2021-02-10 20:20:23 +03:00 |
|
Vladislav Makhov
|
85568fed74
|
web: people: comment out unused code
|
2021-02-10 20:18:38 +03:00 |
|
Vladislav Makhov
|
ea49d6e9e0
|
web: people: add clear selection on selectGroup fn
|
2021-02-10 20:17:37 +03:00 |
|
Vladislav Makhov
|
de8737afcd
|
web: people: add deleteGroup fn
|
2021-02-10 20:15:40 +03:00 |
|
|
|
b8db0ea2a5
|
Web: Files: added new mobx storages
|
2021-02-10 17:46:48 +03:00 |
|
|
|
d804e3fbad
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-10 17:34:49 +03:00 |
|
|
|
c6b9ef48af
|
Files: fix GetRecalculateFilesCountUpdate
|
2021-02-10 15:44:07 +03:00 |
|
Vladislav Makhov
|
7885c26153
|
web: people: refactor onClose
|
2021-02-10 14:14:51 +03:00 |
|
Vladislav Makhov
|
5070dacaa9
|
web: people: migrate selection mechanism to mobx
|
2021-02-10 13:34:35 +03:00 |
|
Vladislav Makhov
|
c2dd454e45
|
web: people: migrate visibility of header group button menu mechanism to mobx
|
2021-02-10 13:34:18 +03:00 |
|
Vladislav Makhov
|
fa3ccbe1de
|
web: people: remove console log
|
2021-02-10 13:33:16 +03:00 |
|
Vladislav Makhov
|
b7635584cc
|
web: people: remove console log
|
2021-02-10 13:32:46 +03:00 |
|
Vladislav Makhov
|
ebe54cc705
|
web: people: add selectionStore and headerMenuStore init
|
2021-02-10 13:32:23 +03:00 |
|
Vladislav Makhov
|
c4346161c2
|
web: people: add isUserSelected fn
|
2021-02-10 13:31:40 +03:00 |
|
Vladislav Makhov
|
e222a96681
|
web: people: add Selection Store
|
2021-02-10 13:30:57 +03:00 |
|
Vladislav Makhov
|
673762894e
|
web: people: add Header Menu Store
|
2021-02-10 13:30:39 +03:00 |
|
|
|
7f8a95058f
|
Web: Files: added context options to files row, added tree menu
|
2021-02-09 17:22:51 +03:00 |
|
Vladislav Makhov
|
09665b1a9d
|
web: people: remove debugger
|
2021-02-09 12:53:42 +03:00 |
|
Vladislav Makhov
|
923b00c8db
|
web: people: switch to getter
|
2021-02-09 12:52:32 +03:00 |
|
Vladislav Makhov
|
2755c6ace0
|
web: people: migrate filter, people fetching mechanism to mobx
|
2021-02-09 12:47:21 +03:00 |
|
Artem Tarasov
|
cfa9b48011
|
Web: People: GroupAction: fixed app crash when creating a group
|
2021-02-08 17:15:54 +03:00 |
|
Viktor Fomin
|
accdc264b8
|
Web: Files: fixed property
|
2021-02-08 14:49:53 +03:00 |
|
Vladislav Makhov
|
e1f7c37a6b
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-08 10:43:36 +03:00 |
|
Vladislav Makhov
|
cf6511cad2
|
web: people: migrate groups data
|
2021-02-08 10:43:20 +03:00 |
|
|
|
04dd3f792c
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-08 10:43:20 +03:00 |
|
|
|
4d4e464275
|
Web: Files: moved isLoading to mobx store, added checkbox to files row
|
2021-02-08 10:43:10 +03:00 |
|
Vladislav Makhov
|
b6a0ba38ca
|
web: people: migrate groups data
|
2021-02-08 10:42:37 +03:00 |
|
Vladislav Makhov
|
9fcd48c110
|
web: people: migrate editing form store to mobx
|
2021-02-08 10:21:40 +03:00 |
|
Vladislav Makhov
|
30c6028350
|
web: people: migrate selected group prop
|
2021-02-08 10:03:05 +03:00 |
|
Vladislav Makhov
|
cd77bfa802
|
web: people: add stores to root
|
2021-02-08 10:02:41 +03:00 |
|
Vladislav Makhov
|
e58a489204
|
web: people: add Selected Group store
|
2021-02-08 10:02:07 +03:00 |
|
Vladislav Makhov
|
d285fa6ae4
|
web: people: add Editing Form store
|
2021-02-08 10:01:49 +03:00 |
|
Vladislav Makhov
|
997f7b6d65
|
web: people: migrate props to mobx
|
2021-02-08 10:01:01 +03:00 |
|
Artem Tarasov
|
3b6ffef2a8
|
Merge branch 'develop' into feature/empty-group
|
2021-02-05 17:26:38 +03:00 |
|
Artem Tarasov
|
cd18cf55cf
|
Web: People: dialogs/Home: fixed crash when deleting user and reopening modal dialog after deleting user
|
2021-02-05 17:26:25 +03:00 |
|
|
|
c10c1f17cd
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-05 16:25:02 +03:00 |
|
|
|
2d9ee116de
|
Web: Files: added new mobx stores, replaced fetchFiles from redux to mobx action
|
2021-02-05 16:24:54 +03:00 |
|
Viktor Fomin
|
da33e26515
|
Web: Files: deleted console.log
|
2021-02-05 16:19:48 +03:00 |
|
Vladislav Makhov
|
e747eeab92
|
web: people: remove dep from use effect
|
2021-02-05 16:19:46 +03:00 |
|
Vladislav Makhov
|
7deee30d24
|
web: people: migrate props to mobx
|
2021-02-05 16:19:18 +03:00 |
|
Vladislav Makhov
|
6ca4a97547
|
web: people: add target user store
|
2021-02-05 16:15:44 +03:00 |
|
Viktor Fomin
|
7188cda442
|
Web: Files: fixed favorite
|
2021-02-05 15:43:55 +03:00 |
|
Viktor Fomin
|
f921bdc9d0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/layout-fix
|
2021-02-05 15:35:42 +03:00 |
|
|
|
c66837ab0d
|
Files: fix status
|
2021-02-05 15:34:12 +03:00 |
|
Artem Tarasov
|
f67d0ca5e1
|
Web: People: GroupAction: fixed reset of the selected group in tree when updating (or following a link) of the group edit page
|
2021-02-05 14:08:48 +03:00 |
|
Vladislav Makhov
|
ce9b0e9ba8
|
web: people: add mobx props
|
2021-02-05 13:50:02 +03:00 |
|
Vladislav Makhov
|
d98b554695
|
web: people: replace redux connect with mobx
|
2021-02-05 13:49:44 +03:00 |
|
Artem Tarasov
|
89a21a6fca
|
Web: People/Common: fixed group reselect when exiting empty group editor, removed console.log() and unused code
|
2021-02-05 13:23:59 +03:00 |
|
Viktor Fomin
|
2de83fa0ae
|
Web: Files: fixed icons
|
2021-02-04 20:16:56 +03:00 |
|
Vladislav Makhov
|
6b98264bb2
|
web: add current user id
|
2021-02-04 20:11:58 +03:00 |
|
Vladislav Makhov
|
79a3ca68fd
|
web: fix data
|
2021-02-04 20:11:41 +03:00 |
|
Vladislav Makhov
|
a8eeb6e6e8
|
web: people: migrate isAdmin prop
|
2021-02-04 19:29:53 +03:00 |
|
Vladislav Makhov
|
881c56d693
|
web: people: add current module name
|
2021-02-04 18:58:24 +03:00 |
|
Vladislav Makhov
|
ffbc9cb57e
|
web: people: replace class component to functional
|
2021-02-04 18:26:44 +03:00 |
|
Vladislav Makhov
|
4f13f83a81
|
web: people: replace isLoading to MobX prop
|
2021-02-04 18:18:17 +03:00 |
|
Artem Tarasov
|
593d4235d5
|
Web: Piople: GroupAction: added groups transer to PeopleSelector, fixed group reset after unmounting component
|
2021-02-04 17:50:08 +03:00 |
|
Artem Tarasov
|
1121559cda
|
Web: People: fixed fetchGroup action to work with state
|
2021-02-04 17:30:33 +03:00 |
|
Vladislav Makhov
|
7cf89aef1f
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-04 16:24:46 +03:00 |
|
Vladislav Makhov
|
203e02e931
|
web: people: add People store models
|
2021-02-04 16:24:30 +03:00 |
|
Viktor Fomin
|
efd5b28cea
|
Web: Files: fixed spaces
|
2021-02-04 13:33:00 +03:00 |
|
Viktor Fomin
|
2a38633702
|
Web: Files: truncate filename in version history
|
2021-02-04 13:08:22 +03:00 |
|
|
|
9413ea871a
|
Web: Files: moved App from redux to mobx
|
2021-02-04 12:52:43 +03:00 |
|
Vladislav Makhov
|
c3eabf09e8
|
web: people: add inject and observer HOC's
|
2021-02-04 11:55:14 +03:00 |
|
Artem Tarasov
|
3ccf6fe42d
|
Merge branch 'develop' into feature/empty-group
|
2021-02-04 11:08:18 +03:00 |
|
Artem Tarasov
|
9618be3c73
|
Web: People: EmptyScreen: fixed selector for defining empty group
|
2021-02-04 11:01:22 +03:00 |
|
Ilya Oleshko
|
3a01516131
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-03 21:14:58 +03:00 |
|
Artem Tarasov
|
5eef56b5d4
|
Web: People/Common: added and applied a method to request complete information for all groups
|
2021-02-03 17:25:13 +03:00 |
|
Alexey Kostenko
|
c250dc2034
|
Web: Component: Removed duplicate icon
|
2021-02-03 16:15:47 +03:00 |
|
Alexey Kostenko
|
3262f62c89
|
Merge branch 'develop' into feature/access-rights-fix
|
2021-02-03 16:06:52 +03:00 |
|
Alexey Kostenko
|
5a343565f4
|
Web: Files: SharingPanel: ComboBox button style fix
|
2021-02-03 16:03:23 +03:00 |
|
Alexey Kostenko
|
da2216c005
|
Web: Files: Changed internal link icon
|
2021-02-03 14:39:32 +03:00 |
|
|
|
59ffbeaf1e
|
People: added method to get groups with members
|
2021-02-03 13:48:52 +03:00 |
|
Alexey Kostenko
|
bfcbf8fbdd
|
Merge branch 'develop' into feature/row-content-icon-fix
|
2021-02-03 10:45:00 +03:00 |
|
Vladislav Makhov
|
ee4dc0b142
|
web: add provider to People, fix init data fetching
|
2021-02-03 09:22:56 +03:00 |
|
Artem Tarasov
|
a23348732f
|
Merge branch 'develop' into feature/empty-group
|
2021-02-02 20:31:09 +03:00 |
|
Artem Tarasov
|
ecce59a4ff
|
Web: Common/People: Filter: renamed method resetWithoutGroup to reset'
|
2021-02-02 20:12:38 +03:00 |
|
Alexey Kostenko
|
2cadd58cf5
|
Web: Files: Do not show the pencil icon in Row, if user can't to edit the a document
|
2021-02-02 18:13:27 +03:00 |
|
|
|
2a79d8bb8d
|
Web: Moved code to AuthStore usage
|
2021-02-02 17:26:58 +03:00 |
|
Artem Tarasov
|
b2aac3838c
|
Web: People/Files/Common: Filter: fixed default value for Search
|
2021-02-02 16:35:06 +03:00 |
|
Viktor Fomin
|
05d1359e39
|
Web: Files: added translate
|
2021-02-02 15:40:04 +03:00 |
|
Viktor Fomin
|
793a28715c
|
Web: Files: added translate
|
2021-02-02 15:38:26 +03:00 |
|
Viktor Fomin
|
4774a35c40
|
Web: Files: added translate
|
2021-02-02 15:34:29 +03:00 |
|
Vladislav Makhov
|
27523dc53a
|
web: files: fix merge
|
2021-02-02 10:44:56 +03:00 |
|
Vladislav Makhov
|
26cdc94f1c
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.People/Client/src/App.js
|
2021-02-02 10:43:37 +03:00 |
|
Vladislav Makhov
|
25e58bcdf3
|
web: add provider
|
2021-02-02 10:23:00 +03:00 |
|
|
|
f8e6a72460
|
Web: Changed work with settings data from redux to mobx
|
2021-02-02 09:48:57 +03:00 |
|
Viktor Fomin
|
19a5526af4
|
Web: Files: added success message translate
|
2021-02-02 00:40:09 +03:00 |
|
Viktor Fomin
|
7dfa50a23e
|
Web: Files: delete files without notification
|
2021-02-02 00:36:18 +03:00 |
|
|
|
0577bb635d
|
Web: People: Changed work with user data from redux to mobx
|
2021-02-01 20:33:39 +03:00 |
|
TatianaLopaeva
|
af96aaf2b3
|
Web: Changed imports.
|
2021-02-01 16:10:02 +03:00 |
|
Alexey Kostenko
|
6bd41fa586
|
Web: Files: Fixed date, time and username in version history
|
2021-02-01 14:34:43 +03:00 |
|
Vladislav Makhov
|
de88da2fa7
|
Web: Changed work with user data from redux to mobx
|
2021-02-01 11:45:26 +03:00 |
|
Ilya Oleshko
|
8910ab5d65
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-01 10:42:18 +03:00 |
|
Artem Tarasov
|
2f19984504
|
Merge branch 'develop' into feature/empty-group
|
2021-01-30 02:29:38 +03:00 |
|
|
|
f91ce2390b
|
Web: Changed work with modules from redux to mobx
|
2021-01-29 18:06:02 +03:00 |
|
|
|
949ba5993e
|
Web: Update yarn.lock files
|
2021-01-29 17:18:49 +03:00 |
|
|
|
9841b2ef1f
|
Web: Added mobx and mobx-react packages
|
2021-01-29 17:17:58 +03:00 |
|
Viktor Fomin
|
753fbb8a58
|
Merge branch 'develop' into bugfix/remove-google-sharing
|
2021-01-29 17:02:48 +03:00 |
|
Viktor Fomin
|
cb2d37f107
|
Web: Files: removed google plus share
|
2021-01-29 16:47:21 +03:00 |
|
Artem Tarasov
|
ddc6aeac40
|
Web: People/Common: Filter: added a method to the filter to reset the state (except for the currnent group and sort)
|
2021-01-29 16:46:14 +03:00 |
|
|
|
652c7bd906
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/Layout/MobileLayout.js
# packages/asc-web-common/src/components/Layout/ScrollToTop.js
# packages/asc-web-common/src/components/Layout/context.js
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/NavMenu/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
# packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
# packages/asc-web-components/src/components/icons/svg/load.error.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.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/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-29 16:39:00 +03:00 |
|
Viktor Fomin
|
1dbf7098bb
|
Web: Files: fixed file status
|
2021-01-29 15:40:35 +03:00 |
|
Ilya Oleshko
|
8226d9185c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-01-29 12:38:22 +03:00 |
|
Artem Tarasov
|
0f68cbfc7b
|
Merge branch 'develop' into feature/empty-group
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
|
2021-01-29 11:52:06 +03:00 |
|
|
|
b0e8b9c6af
|
Bump version to v0.0.10
|
2021-01-29 11:13:27 +03:00 |
|
|
|
a9b16585ea
|
Files: fix delete
|
2021-01-29 10:17:56 +03:00 |
|
TatianaLopaeva
|
8adfa96cbb
|
Web: Files: Deleted useless console.log.
|
2021-01-28 16:20:03 +03:00 |
|
TatianaLopaeva
|
a22e262310
|
Update yarn lock files
|
2021-01-28 16:18:22 +03:00 |
|
Artem Tarasov
|
a55ae75a31
|
Web: People: EmptyScreen: fixed condition for empty group screen
|
2021-01-28 11:29:01 +03:00 |
|
TatianaLopaeva
|
993611097b
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2021-01-28 10:50:29 +03:00 |
|
TatianaLopaeva
|
24ee58f0f6
|
Web: Files/People: Fixed height of context menu for desktop.
|
2021-01-28 10:45:44 +03:00 |
|
Artem Tarasov
|
38cfd5d47b
|
Web: People: EmptyScreen: added selector for emptyGroup
|
2021-01-28 01:22:41 +03:00 |
|
Artem Tarasov
|
1cbc75b02c
|
Web: People: EmptyScreen: added screen for empty group, corrected title and description in EmptyScreen
|
2021-01-28 01:21:50 +03:00 |
|
Artem Tarasov
|
c78852bdff
|
Web: People: EmptyScreen: EmptyScreenContainer moved to a separate file
|
2021-01-28 00:42:24 +03:00 |
|
|
|
0246a30e84
|
Files: fix creation text file
|
2021-01-27 21:11:47 +03:00 |
|
TatianaLopaeva
|
77ce035d15
|
Web: Files/People: Fixed context menu for desktop.
|
2021-01-27 20:01:52 +03:00 |
|
|
|
666a390f13
|
Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header
|
2021-01-27 19:28:45 +03:00 |
|
|
|
680622218e
|
Web: Components: fixed double opening of context menu for desktops
|
2021-01-27 19:28:34 +03:00 |
|
|
|
7cf1252b1e
|
Web: Files: fixed field isFolder to selection
|
2021-01-27 19:26:14 +03:00 |
|
Artem Tarasov
|
93e6777b27
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
|
2021-01-27 18:03:12 +03:00 |
|
Vladislav Makhov
|
72a5b5c2b9
|
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
|
2021-01-27 17:29:09 +03:00 |
|
Vladislav Makhov
|
439abb6cd1
|
web: files: remove unused code
|
2021-01-27 17:28:54 +03:00 |
|
Viktor Fomin
|
32bfef070e
|
Update yarn.lock files
|
2021-01-27 17:23:40 +03:00 |
|
Vladislav Makhov
|
3af17d659f
|
web: files: remove unused code
|
2021-01-27 16:58:46 +03:00 |
|
Vladislav Makhov
|
a50f1a0d87
|
web: files: refactoring
|
2021-01-27 16:58:00 +03:00 |
|
Vladislav Makhov
|
b01200d5ed
|
web: files: remove unused code
|
2021-01-27 16:30:04 +03:00 |
|
Viktor Fomin
|
6e6d706b23
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
|
2021-01-27 16:09:59 +03:00 |
|
|
|
b1dbaf7005
|
Web: Modified first templates
|
2021-01-27 15:38:35 +03:00 |
|
Vladislav Makhov
|
700bca9c61
|
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
|
2021-01-27 13:44:03 +03:00 |
|
Vladislav Makhov
|
7c267fd921
|
web: files: fix progress bar view
|
2021-01-27 13:43:51 +03:00 |
|
Viktor Fomin
|
4cc187fc78
|
Web: Files: fix
|
2021-01-27 13:10:22 +03:00 |
|
Viktor Fomin
|
88ceb29faa
|
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
|
2021-01-27 12:50:50 +03:00 |
|
Viktor Fomin
|
6e48956d08
|
Web: Files: fixed empty panel
|
2021-01-27 12:50:36 +03:00 |
|
Viktor Fomin
|
a8d6ec462a
|
Web: Files: fixed tooltip
|
2021-01-27 12:37:54 +03:00 |
|
Viktor Fomin
|
3363a34113
|
Web: Files: filename truncation
|
2021-01-27 12:18:16 +03:00 |
|
Vladislav Makhov
|
f0052add3e
|
web: files: fix privacy room error
|
2021-01-27 12:17:37 +03:00 |
|
Viktor Fomin
|
9bb716a575
|
Web: Files: returned translation
|
2021-01-27 12:07:24 +03:00 |
|
|
|
436bf7a06e
|
Web: People: Added routes
|
2021-01-27 10:31:29 +03:00 |
|
|
|
30ab7edfcf
|
Web: Fixed import errors
|
2021-01-27 10:29:15 +03:00 |
|
|
|
61cfd029d9
|
Added CRM
|
2021-01-26 20:36:03 +03:00 |
|
|
|
9148527b90
|
Projects: fix
|
2021-01-26 20:09:50 +03:00 |
|
TatianaLopaeva
|
951961ad35
|
Web: Refactoring.
|
2021-01-26 18:21:50 +03:00 |
|
Vladislav Makhov
|
cb11417fb7
|
web: files: fix share button render
|
2021-01-26 17:46:36 +03:00 |
|
TatianaLopaeva
|
2b8dfc80e9
|
Web: Common/Files/People: Fixed "jumps" when go to the next page.
|
2021-01-26 13:50:29 +03:00 |
|
|
|
36c7a171df
|
Web: Fixed load/unload People store
|
2021-01-26 13:36:05 +03:00 |
|
|
|
69922e7c48
|
Added ASC.Projects
|
2021-01-26 12:32:31 +03:00 |
|
|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +03:00 |
|
|
|
b9ed789746
|
Web: Applied WP:ModuleFederation best practices
|
2021-01-26 00:55:46 +03:00 |
|
Vladislav Makhov
|
f02c38080e
|
web: files: fix sharing panel render performance
|
2021-01-25 19:32:45 +03:00 |
|
Vladislav Makhov
|
4400873aa6
|
web: files: remove console log
|
2021-01-25 17:46:37 +03:00 |
|
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
TatianaLopaeva
|
55060e5a23
|
Web: Files: Fixed after merge.
|
2021-01-25 14:57:20 +03:00 |
|
TatianaLopaeva
|
bb8c1962fb
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2021-01-25 14:54:59 +03:00 |
|
Ilya Oleshko
|
e486a7919a
|
Web: Fixed modules icons
|
2021-01-25 14:28:51 +03:00 |
|
|
|
1602fff50c
|
Files: fix insert
|
2021-01-25 12:04:25 +03:00 |
|
|
|
036ddc87c3
|
5.0.2
|
2021-01-22 16:49:38 +03:00 |
|
|
|
f8be896241
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2021-01-22 16:34:40 +03:00 |
|
Viktor Fomin
|
fc4e018c7d
|
Web: Files: fixed uploadData
|
2021-01-22 14:41:45 +03:00 |
|
Viktor Fomin
|
4a00f39d8d
|
Web: Files: fix
|
2021-01-22 14:12:40 +03:00 |
|
TatianaLopaeva
|
4a961ad82c
|
Web: Files/People: Added style condition for a mobile device.
|
2021-01-22 12:50:25 +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 |
|
Viktor Fomin
|
02974a973b
|
Web: Files: fixed icon name typo
|
2021-01-22 11:22:43 +03:00 |
|
Viktor Fomin
|
a5978c676b
|
Web: Files: fixed clear uploadFiles
|
2021-01-22 11:19:39 +03:00 |
|
TatianaLopaeva
|
c44fcf30ed
|
Web: Files: Fixed style of article after merge.
|
2021-01-22 11:17:59 +03:00 |
|
Vladislav Makhov
|
d5567ec4bf
|
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
# Conflicts:
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
|
2021-01-21 21:30:14 +03:00 |
|
Vladislav Makhov
|
703a52a80b
|
web: files: fix render performance
|
2021-01-21 21:18:52 +03:00 |
|
Vladislav Makhov
|
93af940e51
|
web: commented console.log
|
2021-01-21 20:55:36 +03:00 |
|
|
|
3b43cfa334
|
Web: Files: fixed header styles
|
2021-01-21 18:43:48 +03:00 |
|
Artem Tarasov
|
cdecfc3ed3
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Client/src/App.js
|
2021-01-21 16:45:35 +03:00 |
|
Viktor Fomin
|
fa01f99667
|
Web: Files: fixed file icon color witch error
|
2021-01-21 16:34:02 +03:00 |
|
Ilya Oleshko
|
fc8226d592
|
Web: Files: Selectors: Fixed selector props order
|
2021-01-21 15:42:58 +03:00 |
|
Viktor Fomin
|
868526c70d
|
Web: Files: fixed hide header
|
2021-01-21 15:40:28 +03:00 |
|
|
|
2e85d8a220
|
Files: fix insert
|
2021-01-21 10:42:23 +03:00 |
|
TatianaLopaeva
|
1ed838e91e
|
Web: Files/People: Changed the condition for scroll to top on mobile/tablet devices.
|
2021-01-20 22:13:23 +03:00 |
|
TatianaLopaeva
|
d033841728
|
Web: Common: Removed scrolled of article on mobile/tablet devices.
|
2021-01-20 21:56:32 +03:00 |
|
TatianaLopaeva
|
4c262c2854
|
Web: Common: Changed mobile layout only for mobile/tablet devices.
|
2021-01-20 21:04:00 +03:00 |
|
Viktor Fomin
|
6107494d16
|
Web: Files: fixed finish upload
|
2021-01-20 15:04:41 +03:00 |
|
|
|
8d62eb5fbf
|
Update yarn.lock files
|
2021-01-20 12:55:23 +03:00 |
|
Viktor Fomin
|
fbcf056533
|
Web: Files: delete tooltip shadow
|
2021-01-20 12:51:59 +03:00 |
|
|
|
bf7a5d81df
|
Web: Files: fix "getsharingkeys" working
|
2021-01-20 12:36:35 +03:00 |
|
Viktor Fomin
|
f3d9b68211
|
Web: Files: fixed upload empty files
|
2021-01-20 12:35:19 +03:00 |
|
Viktor Fomin
|
1f08c79de3
|
Web: Files: fix
|
2021-01-19 16:21:15 +03:00 |
|
Viktor Fomin
|
b7482fa533
|
Web: Files: fixed file name color with error
|
2021-01-19 15:37:09 +03:00 |
|
Viktor Fomin
|
544adbbf0b
|
Web: Files: rename download panel
|
2021-01-19 15:26:52 +03:00 |
|
Viktor Fomin
|
565bf9949e
|
Web: Files: added translation
|
2021-01-19 14:59:20 +03:00 |
|
Viktor Fomin
|
2888eff58c
|
Web: Files: fix
|
2021-01-19 14:53:32 +03:00 |
|
Viktor Fomin
|
ef1957a9aa
|
Web: Files: fixed styles
|
2021-01-19 14:41:17 +03:00 |
|
Viktor Fomin
|
c53fd493b4
|
Web: Files: open download panel
|
2021-01-19 14:40:21 +03:00 |
|
Viktor Fomin
|
3acc84ff7c
|
Web: Files: resolved conflicts download panel
|
2021-01-19 14:05:44 +03:00 |
|
Viktor Fomin
|
2b2b195954
|
Web: Files: created download panel
|
2021-01-19 13:38:15 +03:00 |
|
|
|
3b959f81ed
|
Bump version to v0.0.9
|
2021-01-18 19:06:31 +03:00 |
|
|
|
4d54aa766e
|
Web: Files: removed useless api requests
|
2021-01-18 18:52:08 +03:00 |
|
|
|
f025c06299
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-18 17:17:01 +03:00 |
|
Vladislav Makhov
|
36eba1c54c
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-18 16:57:47 +03:00 |
|
Vladislav Makhov
|
cf4f509a7a
|
web: files: fix connect panel opening
|
2021-01-18 16:57:36 +03:00 |
|
|
|
c8925cbb8b
|
Web: Files: Fixed warnings on Chrome DevTools
|
2021-01-18 16:49:29 +03:00 |
|
|
|
a5882a04ee
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-18 16:05:27 +03:00 |
|
|
|
fa2aef8e35
|
Files: fixed upload
|
2021-01-18 15:45:27 +03:00 |
|
|
|
e2c68dd09e
|
Web: Files: fixed update thirdparty folders
|
2021-01-18 15:32:21 +03:00 |
|
|
|
445d2886b8
|
Web: Files: fixed empty screens for files
|
2021-01-18 14:43:22 +03:00 |
|
|
|
30ccd43252
|
Web: Added Enter handler
|
2021-01-18 13:22:23 +03:00 |
|
TatianaLopaeva
|
a4f416789a
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2021-01-18 12:02:40 +03:00 |
|
|
|
781386bd63
|
Files: fix deserialization
|
2021-01-18 11:59:17 +03:00 |
|
|
|
7c5ea61c2f
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-18 11:56:10 +03:00 |
|
|
|
4917fcdc71
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-18 11:38:21 +03:00 |
|
|
|
6ec1e8baf0
|
Web: Files: fixed thirdparty loader
|
2021-01-18 11:38:14 +03:00 |
|
|
|
c6072b3c52
|
Thirdparty: fixed scope
|
2021-01-18 11:06:40 +03:00 |
|
|
|
f5179cd9f9
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-18 11:05:47 +03:00 |
|
|
|
b89b73f823
|
Web: Files: Changed base modal container
|
2021-01-18 11:05:32 +03:00 |
|
|
|
a342e661aa
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-15 19:19:57 +03:00 |
|
|
|
738e834345
|
Web: Files: fixed onClose service connection dialog
|
2021-01-15 19:19:48 +03:00 |
|
Artem Tarasov
|
f5a1225d8d
|
Web: Files: Settings: fixed loader display when switching from the settings tree
|
2021-01-15 19:10:44 +03:00 |
|
|
|
cb1b62d1c0
|
Web: Files: added error border
|
2021-01-15 18:41:30 +03:00 |
|
|
|
e78899e63f
|
Web: Files: fixed display of errors
|
2021-01-15 18:37:17 +03:00 |
|
|
|
7de7d6ea5e
|
Web: Files: fixed setIsLoading after connection thirdparty
|
2021-01-15 18:24:55 +03:00 |
|
|
|
e70211e071
|
Web: Files: fixed setErrorText
|
2021-01-15 18:18:42 +03:00 |
|
|
|
e23dcb1556
|
Web: Files: fixed display of thirdparty folders
|
2021-01-15 18:11:06 +03:00 |
|
TatianaLopaeva
|
f14f83d1a1
|
Web: People/Files: Refactoring.
|
2021-01-15 17:55:18 +03:00 |
|
TatianaLopaeva
|
26c680010a
|
Web: Common/People: Deleted useless imports.
|
2021-01-15 17:50:30 +03:00 |
|
|
|
4043f55849
|
Web: Files: added isLoading for thirdparty save button
|
2021-01-15 17:44:19 +03:00 |
|
|
|
096c8182a9
|
Web: Files: added isRequired to thirdparty fields
|
2021-01-15 17:39:58 +03:00 |
|
|
|
ca0e16adfa
|
Web: Files: added error notification for thirdparty connection, removed route after connection
|
2021-01-15 17:35:14 +03:00 |
|
|
|
0f96dcfeb4
|
Files: fix copy thirdparty folder
|
2021-01-15 14:08:05 +03:00 |
|
|
|
90f81df4c7
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-15 13:39:31 +03:00 |
|
Vladislav Makhov
|
429fa91ced
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-15 13:37:03 +03:00 |
|
Vladislav Makhov
|
83557dc329
|
web: files: remove unnecessary code
|
2021-01-15 13:36:39 +03:00 |
|
Vladislav Makhov
|
3b1c0fc530
|
web: files: fix opening common folder
|
2021-01-15 13:34:02 +03:00 |
|
|
|
eafe767d9a
|
Files: fixed file marker
|
2021-01-15 13:23:39 +03:00 |
|
|
|
d26bf8a343
|
Web: Files: Fixed displaying DocEditor
|
2021-01-15 13:09:28 +03:00 |
|
|
|
7650acfec3
|
Bump version to v0.0.8
|
2021-01-15 13:03:47 +03:00 |
|
Vladislav Makhov
|
52ac07dde9
|
web: files: fix fields validation without credentials data
|
2021-01-15 12:52:21 +03:00 |
|
Ilya Oleshko
|
7e992ef248
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-15 12:05:28 +03:00 |
|
|
|
290ff5e1bd
|
Web: Files: fixed capabilitiesItem error
|
2021-01-15 12:00:27 +03:00 |
|
Ilya Oleshko
|
24127929aa
|
Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect
|
2021-01-15 11:52:29 +03:00 |
|
|
|
2b2e7ba8bf
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-15 10:41:45 +03:00 |
|
|
|
99c92f688a
|
Web: Files: fixed user access
|
2021-01-15 10:41:32 +03:00 |
|
TatianaLopaeva
|
c87c8e4026
|
Web: Files: Return condition for set new state of header visibility.
|
2021-01-14 20:35:32 +03:00 |
|
Artem Tarasov
|
afca6a3463
|
Web: Files: ConnectDialog: added tabIndex to input elements and enter key press handler
|
2021-01-14 18:11:23 +03:00 |
|
|
|
4ea47886f6
|
Bump version to v0.0.7
|
2021-01-14 17:56:05 +03:00 |
|
Vladislav Makhov
|
b8e8480120
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/locales/en/translation.json
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/locales/ru/translation.json
|
2021-01-14 17:14:39 +03:00 |
|
Vladislav Makhov
|
227da9cd43
|
web: client: fix submitting empty fields in modal
|
2021-01-14 17:13:06 +03:00 |
|
Artem Tarasov
|
0c729c787a
|
Web: Files: ConnectDialog: fix translation
|
2021-01-14 16:27:26 +03:00 |
|
|
|
f46e69af6f
|
Web: Files: fixed updating of tree folders after editing a third-party folder
|
2021-01-14 13:29:06 +03:00 |
|
|
|
6f25123e50
|
Web: Files: fixed renaming of thirdparty folder
|
2021-01-14 13:23:30 +03:00 |
|
|
|
c6d4ff33b0
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-14 13:00:41 +03:00 |
|
|
|
44fd647f02
|
Web: Files: fixed rename folder
|
2021-01-14 13:00:32 +03:00 |
|
Vladislav Makhov
|
04ea490eec
|
web: client: fix node margin
|
2021-01-14 12:50:16 +03:00 |
|
|
|
f2374ab669
|
Web: Files: fix opening links by url /Products/Files/DocEditor.aspx
|
2021-01-14 12:06:10 +03:00 |
|
|
|
77d7df2b0d
|
Web: Files: fixed markasread files
|
2021-01-14 11:50:15 +03:00 |
|
|
|
47b5ff25ea
|
Web: Files: Fix detecting doceditor page insensitive way
|
2021-01-14 11:39:36 +03:00 |
|
|
|
a1612a39c9
|
Web: Files: Added opportunity to open documents by old links
|
2021-01-14 11:02:31 +03:00 |
|
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
TatianaLopaeva
|
b8c2120fac
|
Web: Files: Added scrolling up when navigating between folders.
|
2021-01-13 20:11:37 +03:00 |
|
TatianaLopaeva
|
20bb304f1e
|
Web: Files: Deleted useless conditions.
|
2021-01-13 19:20:27 +03:00 |
|
|
|
576f473f4e
|
Tags: fix
|
2021-01-13 19:09:05 +03:00 |
|
|
|
d63ab9910a
|
Web: Files: fixed update service folders
|
2021-01-13 18:43:07 +03:00 |
|
|
|
34ab7983b7
|
Web: Files: fixed thirdparty edit
|
2021-01-13 17:29:24 +03:00 |
|
Viktor Fomin
|
4d60745a11
|
Web: Files: fixed undefined customer title
|
2021-01-13 16:32:13 +03:00 |
|
TatianaLopaeva
|
f0679f3cdf
|
Web: Files/People: Fixed scrolling to the top when switching to a new page.
|
2021-01-13 16:19:20 +03:00 |
|
|
|
f3a2162537
|
Web: Files: added context menu to connection clouds
|
2021-01-13 14:17:45 +03:00 |
|
|
|
144a86fca7
|
Files: fix Deserialize
|
2021-01-13 13:49:52 +03:00 |
|
|
|
a41b774fe8
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-13 13:42:26 +03:00 |
|
|
|
c5ebea42de
|
Web: Files: fixed getIsThirdPartySelection selector
|
2021-01-13 13:42:18 +03:00 |
|
|
|
ef686d78ac
|
Merge pull request #168 from ONLYOFFICE/features/jenkins-test
Jenkinsfile: run test
|
2021-01-13 13:31:46 +03:00 |
|
TatianaLopaeva
|
9bcb922c1a
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.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/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.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
|
2021-01-13 13:27:55 +03:00 |
|
Artem Tarasov
|
b239b7304f
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-13 12:54:03 +03:00 |
|
Artem Tarasov
|
7176819acc
|
Web: Files: thirdParty: fixed service connection and window closing after connection
|
2021-01-13 12:53:46 +03:00 |
|
|
|
ae69a9559e
|
Files: removed temp
|
2021-01-13 12:41:29 +03:00 |
|
Vladislav Makhov
|
1895cf45df
|
web: client: fix folder title in modal
|
2021-01-13 12:40:52 +03:00 |
|
Vladislav Makhov
|
73ef78f465
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-13 11:43:55 +03:00 |
|
Vladislav Makhov
|
e6e6a6e2dd
|
web: client: fix node selection
|
2021-01-13 11:43:42 +03:00 |
|
|
|
b05a809a32
|
Files: fix API SetAceLink for third-party
|
2021-01-13 11:40:11 +03:00 |
|
|
|
52fc96fa25
|
Web: Files: fixed copying service folders
|
2021-01-13 10:31:52 +03:00 |
|
|
|
60562d69a3
|
Files: test fix
|
2021-01-13 10:21:29 +03:00 |
|
|
|
a65aa18c17
|
Files: temp fix
|
2021-01-12 21:35:56 +03:00 |
|
|
|
f6ca373137
|
MemoryCache -> IMemoryCache
|
2021-01-12 20:51:14 +03:00 |
|
|
|
19c9001082
|
Files: fix test
|
2021-01-12 18:32:05 +03:00 |
|
|
|
122048dd49
|
Files: temp fix
|
2021-01-12 18:27:56 +03:00 |
|
|
|
5289f92935
|
Files: temp fix
|
2021-01-12 18:01:38 +03:00 |
|
|
|
f21d81fe57
|
Files: fix long operations
|
2021-01-12 17:23:56 +03:00 |
|
Vladislav Makhov
|
7dc14d3688
|
web: client: fix recycle bin node style
|
2021-01-12 17:22:28 +03:00 |
|
|
|
d14f3d951a
|
Web: Files: fixed thirdparty connection folder name
|
2021-01-12 16:48:50 +03:00 |
|
|
|
d118a9d5c8
|
Files: fix tests
|
2021-01-12 16:46:55 +03:00 |
|
|
|
5a80d1c756
|
Web: Files: fixed move operation for thirdparty folders
|
2021-01-12 16:35:55 +03:00 |
|
|
|
13cf5e5ad0
|
Files: tests. long operations
|
2021-01-12 16:00:05 +03:00 |
|
Vladislav Makhov
|
173cb950e7
|
web: client: fix switcher render
|
2021-01-12 15:27:35 +03:00 |
|
|
|
9f9a517f92
|
Web: Files: fixed display of service folders for tree folders
|
2021-01-12 15:12:08 +03:00 |
|
Ilya Oleshko
|
3cfeb2e5ed
|
Web: Files: Fixed open oAuth modal
|
2021-01-12 13:51:41 +03:00 |
|
|
|
1b1d57ba35
|
Files: fix tests
|
2021-01-12 13:43:44 +03:00 |
|
|
|
682ca73a91
|
Files: fix tests
|
2021-01-12 13:16:11 +03:00 |
|
|
|
abaf8df8dc
|
Files: test. Show error
|
2021-01-12 12:26:09 +03:00 |
|
Vladislav Makhov
|
b37b9f3292
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-12 12:09:02 +03:00 |
|
Vladislav Makhov
|
69e56c9337
|
web: client: fix outline border
|
2021-01-12 12:08:48 +03:00 |
|
Vladislav Makhov
|
70e406d77e
|
web: client: fix open location of added provider
|
2021-01-12 12:07:39 +03:00 |
|
|
|
5dbd0653f5
|
Files: test. fix order
|
2021-01-12 11:35:10 +03:00 |
|
Ilya Oleshko
|
80bf09b5d8
|
Web: Files : Article: Returned expanded icon for common folder
|
2021-01-12 11:33:02 +03:00 |
|
|
|
b149a5f3a5
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2021-01-12 09:49:04 +03:00 |
|
Artem Tarasov
|
fddae00ffd
|
Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-12 09:49:54 +03:00 |
|
Artem Tarasov
|
28c93bc32d
|
Web: Files: Settings: removed unknown symbol in the window for adding a new account.
|
2021-01-12 09:49:24 +03:00 |
|
|
|
4aae74ed48
|
Web: Files: fixed files operations
|
2021-01-12 09:48:55 +03:00 |
|
|
|
84a6f19e15
|
Files: fix test
|
2021-01-11 22:03:11 +03:00 |
|
|
|
ac3f877a7c
|
Files: fix test
|
2021-01-11 21:22:53 +03:00 |
|
|
|
9375dfd540
|
Files: fix test
|
2021-01-11 21:16:40 +03:00 |
|
|
|
441cf7e7cd
|
Files: Test. Fix path
|
2021-01-11 20:50:17 +03:00 |
|
|
|
f66060fff1
|
Web: Files: Added new events handlers for DocsAPI SDK
|
2021-01-11 14:34:45 +03:00 |
|
|
|
9767111de3
|
Web: Files: fixed thirdparty route
|
2021-01-11 13:34:29 +03:00 |
|
|
|
ebaf9ccecd
|
Web: Files: fix merge
|
2021-01-11 13:24:07 +03:00 |
|
|
|
5489d74b27
|
Web: Files: fixed getFilesList selector
|
2021-01-11 13:03:58 +03:00 |
|
|
|
c7c9225923
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.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/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2021-01-11 12:37:31 +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 |
|
|
|
60022bbc06
|
Update yarn.lock files
|
2020-12-30 21:33:07 +03:00 |
|
Vladislav Makhov
|
1f8769cd6b
|
Update yarn.lock
|
2020-12-30 19:51:17 +03:00 |
|
|
|
f40b347289
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 19:42:59 +03:00 |
|
|
|
9e5a39c78e
|
Remove useless code
|
2020-12-30 19:29:47 +03:00 |
|
|
|
8b42c104a8
|
Fix group button menu on tablet at desktop
|
2020-12-30 19:29:18 +03:00 |
|
|
|
4e938572b8
|
Fix displaying privacy shield icon
|
2020-12-30 19:06:26 +03:00 |
|
|
|
fc55550521
|
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
|
2020-12-30 18:03:11 +03:00 |
|
|
|
95f0d03e11
|
Fix open new document on desktop
|
2020-12-30 17:56:38 +03:00 |
|
