|
|
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 |
|
|
|
8d62eb5fbf
|
Update yarn.lock files
|
2021-01-20 12:55:23 +03:00 |
|
|
|
b07e76d993
|
web: common: bump version
|
2021-01-20 12:49:23 +03:00 |
|
|
|
ceb1da1c06
|
Web: Files: fix "getsharingkeys" condition
|
2021-01-20 12:49:14 +03:00 |
|
|
|
39d904a7c5
|
web: common: bump version
|
2021-01-20 12:36:58 +03:00 |
|
|
|
bf7a5d81df
|
Web: Files: fix "getsharingkeys" working
|
2021-01-20 12:36:35 +03:00 |
|
|
|
3b959f81ed
|
Bump version to v0.0.9
|
2021-01-18 19:06:31 +03:00 |
|
Artem Tarasov
|
2619753ade
|
Web: Client: TgirdPartySettings: removed unused code
|
2021-01-18 17:57:51 +03:00 |
|
|
|
83368921d3
|
web: common: bump version
|
2021-01-18 12:02:15 +03:00 |
|
|
|
35be26204c
|
Web: Common: fixed SettingsFilesLoader width
|
2021-01-18 12:01:36 +03:00 |
|
|
|
ef22eb04c5
|
Web: Client: Fix third-party response page displaying
|
2021-01-15 18:15:07 +03:00 |
|
Ilya Oleshko
|
8f3b4a60dd
|
Web: Files: Added ThirdPartyResponse page error container, fixed router
|
2021-01-15 16:28:08 +03:00 |
|
|
|
90f81df4c7
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-15 13:39:31 +03:00 |
|
|
|
7650acfec3
|
Bump version to v0.0.8
|
2021-01-15 13:03:47 +03:00 |
|
Ilya Oleshko
|
24127929aa
|
Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect
|
2021-01-15 11:52:29 +03:00 |
|
|
|
4ea47886f6
|
Bump version to v0.0.7
|
2021-01-14 17:56:05 +03:00 |
|
|
|
4c6538f849
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-14 11:00:18 +03:00 |
|
Vladislav Makhov
|
2391bc001c
|
web: common: bump version
|
2021-01-14 10:59:03 +03:00 |
|
Vladislav Makhov
|
567c951dfd
|
web: common: fix language data in private browsing mode
|
2021-01-14 10:58:49 +03:00 |
|
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
|
|
ae69a9559e
|
Files: removed temp
|
2021-01-13 12:41:29 +03:00 |
|
Vladislav Makhov
|
7289f53628
|
web: common: bump version
|
2021-01-13 11:27:59 +03:00 |
|
Vladislav Makhov
|
754ae6713d
|
web: common: fix link
|
2021-01-13 11:27:41 +03:00 |
|
|
|
f6ca373137
|
MemoryCache -> IMemoryCache
|
2021-01-12 20:51:14 +03:00 |
|
Artem Tarasov
|
9e9cf3face
|
web: components: bump version
|
2021-01-12 17:27:26 +03:00 |
|
Artem Tarasov
|
9df05a53c9
|
Web: Components: ModalDialog: fixed cursor type in modal
|
2021-01-12 17:27:03 +03:00 |
|
Artem Tarasov
|
adc795feb4
|
Web: Client: thirdPartySettings: changed the cursor to default
|
2021-01-12 13:24:44 +03:00 |
|
Vladislav Makhov
|
7ad7d4556e
|
web: common: fix links in tpi settings
|
2021-01-12 09:27:04 +03:00 |
|
Vladislav Makhov
|
745bd8be2c
|
web: common: bump version
|
2021-01-12 09:25:42 +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 |
|
Vladislav Makhov
|
d87f9d0864
|
web: common: bump version
|
2020-12-30 19:45:24 +03:00 |
|
Vladislav Makhov
|
b2c6669e42
|
web: components: bump version
|
2020-12-30 19:45:01 +03:00 |
|
|
|
f40b347289
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 19:42:59 +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 |
|
Vladislav Makhov
|
44ba6f350f
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 16:20:47 +03:00 |
|
Artem Tarasov
|
3d7eada1a6
|
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
|
2020-12-30 12:15:50 +03:00 |
|
Artem Tarasov
|
f419dadb6f
|
Web: Common: Layout: fix resize event listener for safari versions less then 14
|
2020-12-30 11:35:24 +03:00 |
|
|
|
74aa0abca8
|
Bump version to v0.0.6
|
2020-12-29 19:43:37 +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 |
|
Vladislav Makhov
|
e6cf51575a
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 16:08:08 +03:00 |
|
|
|
39a0cb99de
|
Update yarn.lock files
|
2020-12-29 14:03:05 +03:00 |
|
|
|
e70e845c5f
|
web: common: bump version
|
2020-12-29 13:52:50 +03:00 |
|
|
|
675599c57d
|
web: components: bump version
|
2020-12-29 13:52:38 +03:00 |
|
Vladislav Makhov
|
7dfdae8a72
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 09:33:55 +03:00 |
|
|
|
f18d535cb1
|
Merge branch 'develop' into feature/upgrade-dependencies
|
2020-12-28 18:30:50 +03:00 |
|
Vladislav Makhov
|
d840506715
|
Fix desktop styles
|
2020-12-28 16:49:01 +03:00 |
|
