Commit Graph

3233 Commits

Author SHA1 Message Date
a21fff2ab1 Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0". 2020-12-28 11:04:34 +03:00
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +03:00
9f8ff83084 Update yarn.lock files 2020-12-25 16:24:26 +03:00
2b08c711dc Update Create-react-app to v4.0.1 2020-12-25 16:01:04 +03:00
20900eeb72 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-12-25 12:09:52 +03:00
d0ce5585a5 Files: fixed query 2020-12-24 22:05:39 +03:00
9350f1189e Bump version to v0.0.5 2020-12-24 12:22:48 +03:00
Artem Tarasov
e4ae387718 Web: Files: VersionHistory: refactoring 2020-12-24 10:52:34 +03:00
Artem Tarasov
5df8b7cc5b Web: Files: VersionHistory: Ver. added to translation 2020-12-24 10:15:50 +03:00
Artem Tarasov
465765338c Web: Files: versionHistory: fix after merge 2020-12-24 10:05:26 +03:00
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
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
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
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
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
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
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
14aef6259f Web: Files: fixed display of conversion in the download as dialog 2020-12-23 13:33:23 +03:00
7803696e01 Update yarn.lock files 2020-12-23 12:43:27 +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
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
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
64f8aadd56 People: fix activation email 2020-12-22 15:54:34 +03:00
2d9906f6a1 Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users 2020-12-22 15:34:19 +03:00
001fedf87d Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4 2020-12-22 14:55:48 +03:00
50b45b785a Web: People: fixed access to editing the profile for the user, fixed the registration date 2020-12-22 14:55:35 +03:00
Vladislav Makhov
4252d27e4f Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-22 14:18:03 +03:00
Vladislav Makhov
f7c96b3d00 web: files: fix paging count view 2020-12-22 14:17:56 +03:00
Alexey Kostenko
30656f4256 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-22 13:04:11 +03:00
Alexey Kostenko
97a61b2f0d Web: Files: Fixed share to twitter (Previously, only part of the link was shared) 2020-12-22 13:04:02 +03:00
Alexey Kostenko
fe682b1cf8 Web: Files: Fixed facebook share 2020-12-22 12:32:22 +03:00
06de1efbae Update yarn.lock files 2020-12-22 11:59:57 +03:00
cb2a7e53c8 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-22 11:50:52 +03:00
1a48c54ec4 Web: Files: VersionHistory: fixed access to documents 2020-12-22 11:50:59 +03:00
4f8c04a10f Web: People: Fixed displaying SectionHeader loader 2020-12-22 11:50:44 +03:00
Artem Tarasov
e6938def26 Web: Files VersionHistory: refactoring 2020-12-22 11:46:22 +03:00