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 |
|
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 |
|
Vladislav Makhov
|
d47f53c775
|
Fix share button in private room
|
2020-12-30 17:34:23 +03:00 |
|
Vladislav Makhov
|
97837afaa6
|
Fix delete button in private room
|
2020-12-30 17:33:19 +03:00 |
|
Vladislav Makhov
|
44ba6f350f
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 16:20:47 +03:00 |
|
Vladislav Makhov
|
8cec798da7
|
Remove unused code
|
2020-12-30 16:17:09 +03:00 |
|
|
|
3bdd023006
|
Merge branch 'master' into develop
|
2020-12-30 14:54:44 +03:00 |
|
Vladislav Makhov
|
5bc3704ca5
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# 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/store/files/selectors.js
|
2020-12-30 13:11:54 +03:00 |
|
Ilya Oleshko
|
365596cb8c
|
Web: Files : Fixed styles of new-files-panel for mobile
|
2020-12-30 12:37:48 +03:00 |
|
|
|
4dfd88daca
|
Files: EncryptionKeysConfig->CryptoEngineId
|
2020-12-30 12:24:49 +03:00 |
|
Artem Tarasov
|
3a9f3b6e02
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:16:26 +03:00 |
|
Artem Tarasov
|
b2317b3a06
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:16:05 +03:00 |
|
Artem Tarasov
|
3d7eada1a6
|
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
|
2020-12-30 12:15:50 +03:00 |
|
Ilya Oleshko
|
5dea8f2409
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:13:42 +03:00 |
|
Ilya Oleshko
|
065ae43f0a
|
Web: People : Profile : Fixed autofocus on mobile
|
2020-12-30 12:13:33 +03:00 |
|
Vladislav Makhov
|
e2b7fecba5
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:09:55 +03:00 |
|
Vladislav Makhov
|
27783eaee4
|
web: files: fix paging
|
2020-12-30 12:09:28 +03:00 |
|
|
|
8c8acc089a
|
Web: Files: fixed dropdown in DownloadDialog
|
2020-12-30 12:07:55 +03:00 |
|
|
|
0fe23ef361
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-30 11:48:26 +03:00 |
|
|
|
bf5781c2c0
|
fix startup
|
2020-12-29 19:45:18 +03:00 |
|
|
|
74aa0abca8
|
Bump version to v0.0.6
|
2020-12-29 19:43:37 +03:00 |
|
|
|
d54a5a0656
|
Added reqDesktop on DocEditor page
|
2020-12-29 18:43:12 +03:00 |
|
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
|
|
7b4dc42620
|
Fix displaying header pre-loader on Desktop
|
2020-12-29 17:19:02 +03:00 |
|
|
|
058d905286
|
Merge branch 'develop' into feature/change-owner-panel
|
2020-12-29 16:27:43 +03:00 |
|
TatianaLopaeva
|
5340bded2f
|
Web: Common: Fixed displaying of article header at user profile.
|
2020-12-29 16:25:39 +03:00 |
|
|
|
32d9331c7d
|
Web: Files: fixed isCanShare selector
|
2020-12-29 16:22:24 +03:00 |
|
