Artem Tarasov
|
d756354ece
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# web/ASC.Web.Common/package.json
|
2020-12-24 09:47:22 +03:00 |
|
Diana
|
aa667a02ef
|
fix
|
2020-12-24 03:21:29 +03:00 |
|
Diana
|
e20b87447e
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-24 03:18:47 +03:00 |
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
|
6cfe5ce45e
|
Merge pull request #156 from ONLYOFFICE/hotfix/v0.0.4
Hotfix/v0.0.4
|
2020-12-23 21:20:52 +03:00 |
|
Artem Tarasov
|
ae1a0cd8c1
|
Web: Files: versionHistory: applied new actions, removed unnecessary api requests
|
2020-12-23 19:29:05 +03:00 |
|
Artem Tarasov
|
4576f13c9e
|
Web: Files: versionHistory: fix actions
|
2020-12-23 18:53:09 +03:00 |
|
|
1891813132
|
fix save tenant
|
2020-12-23 18:36:05 +03:00 |
|
Vladislav Makhov
|
87ffdf40ad
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-12-23 17:56:44 +03:00 |
|
Vladislav Makhov
|
248e032e10
|
web: files: fix paging combo box
|
2020-12-23 17:55:58 +03:00 |
|
Vladislav Makhov
|
9a567d3e53
|
web: components: added possibility to hide combo box with count items info
|
2020-12-23 17:55:03 +03:00 |
|
Vladislav Makhov
|
3d46b8e516
|
web: components: bump version
|
2020-12-23 17:53:00 +03:00 |
|
Artem Tarasov
|
8b4762b9a7
|
Web: Files: versionHistory: added action updateCommentVersion
|
2020-12-23 17:46:27 +03:00 |
|
Artem Tarasov
|
b15e6db9cc
|
Web: Files: versionHistory: added action restoreVersion
|
2020-12-23 16:54:12 +03:00 |
|
|
f3a45738a1
|
Web: Files: fix merge
|
2020-12-23 16:13:12 +03:00 |
|
Artem Tarasov
|
6498cd542e
|
Web: Files: versionHistory: added action markAsVersion
|
2020-12-23 15:40:07 +03:00 |
|
Ilya Oleshko
|
b77a6c987f
|
Web: Files : Fixed displaying version actions if not full access
|
2020-12-23 14:12:05 +03:00 |
|
|
a21531dd15
|
web: components: bump version
|
2020-12-23 13:55:41 +03:00 |
|
|
10094f459d
|
Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4
|
2020-12-23 13:55:17 +03:00 |
|
|
c15072b982
|
Web: Components : DropDown : Fixed calculating open direction
|
2020-12-23 13:55:02 +03:00 |
|
Ilya Oleshko
|
b0edb012c8
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-23 13:38:33 +03:00 |
|
Artem Tarasov
|
274b147a3c
|
Web: Files: VersionHistory: added action fetchFileVersions
|
2020-12-23 13:38:10 +03:00 |
|
Ilya Oleshko
|
6162918d5c
|
Web: Files : Fixed context actions for visitors. Added open action to folder
|
2020-12-23 13:36:29 +03:00 |
|
|
a21c16ff1d
|
web: components: bump version
|
2020-12-23 13:33:48 +03:00 |
|
|
14aef6259f
|
Web: Files: fixed display of conversion in the download as dialog
|
2020-12-23 13:33:23 +03:00 |
|
|
7a22da766a
|
Web: Components: added convertSideInfo to row-content
|
2020-12-23 13:31:17 +03:00 |
|
|
d4b736103a
|
Users: fixed queries
|
2020-12-23 13:12:07 +03:00 |
|
Vladislav Makhov
|
3cbf601f8d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# 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/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
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 12:58:11 +03:00 |
|
|
7803696e01
|
Update yarn.lock files
|
2020-12-23 12:43:27 +03:00 |
|
|
ce0e041b16
|
web: common: bump version
|
2020-12-23 12:30:08 +03:00 |
|
|
866f3573b0
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-23 12:29:50 +03:00 |
|
|
21d8c3db79
|
Web: Common: Changed Filter DEFAULT_EMPLOYEE_STATUS to Active
|
2020-12-23 12:29:42 +03:00 |
|
|
21c96decdd
|
Filehandler: fix unhandled exception
|
2020-12-23 12:15:14 +03:00 |
|
Alexey Kostenko
|
ea8d5b471d
|
Web: Files: Fixed document type definitions in download us dialog
|
2020-12-23 12:09:30 +03:00 |
|
|
1d5fc44dac
|
Web: People: Added target for link
|
2020-12-23 11:57:09 +03:00 |
|
|
cffb61d1a5
|
Web: People: Added translation for success of sending the invitation
|
2020-12-23 11:43:53 +03:00 |
|
|
352ec309b8
|
Web: People: Fixed displaying errors on language change
|
2020-12-23 11:34:21 +03:00 |
|
|
73f92d0897
|
Web: Client: fixed user activation
|
2020-12-22 18:48:05 +03:00 |
|
Alexey Kostenko
|
5f7f0b52f0
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-22 18:13:37 +03:00 |
|
Alexey Kostenko
|
ef079d932c
|
Web: Files: Disable button if only non-editable files or folders are selected
|
2020-12-22 18:13:28 +03:00 |
|
TatianaLopaeva
|
44a2303629
|
Web: Files: Fixed download video if the format is not supported by the player.
|
2020-12-22 18:05:46 +03:00 |
|
Vladislav Makhov
|
13cd456baf
|
web: files: fix notifications
|
2020-12-22 17:31:35 +03:00 |
|
|
57ba1d7cc5
|
People: model. Added FromInviteLink
|
2020-12-22 17:19:58 +03:00 |
|
Diana
|
1eb00222a2
|
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-22 16:12:44 +03:00 |
|
|
f86c66a642
|
Test: fix
|
2020-12-22 16:12:23 +03:00 |
|
|
64f8aadd56
|
People: fix activation email
|
2020-12-22 15:54:34 +03:00 |
|
|
b89b41c1d7
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-22 15:51:20 +03:00 |
|
|
0fae06b2bf
|
fix storage
|
2020-12-22 15:51:04 +03:00 |
|
Diana
|
9b338e0f78
|
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-22 15:37:10 +03:00 |
|
|
3d23422ff5
|
web: common: bump version
|
2020-12-22 15:35:50 +03:00 |
|