Commit Graph

3606 Commits

Author SHA1 Message Date
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
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
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
Diana
9b338e0f78 Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop 2020-12-22 15:37:10 +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
20c7ee108e Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-12-22 11:59:26 +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
a54a735cfa Web: People: Fixed displaying not found language in combobox 2020-12-22 11:36:07 +03:00
Diana
589c17ac95 fix 2020-12-22 02:27:10 +03:00
Ilya Oleshko
7b671162b0 Web: Files : Added webm icon 2020-12-21 20:16:54 +03:00
Artem Tarasov
1e7008c031 Web: Files: fixed styles Loaders 2020-12-21 18:44:05 +03:00
Alexey Kostenko
c3fbf9fc93 Web: Files/People: Removed hover on mobile devices in page navigation buttons 2020-12-21 17:56:25 +03:00
Artem Tarasov
0a5619fd43 Web: Files: VersionHistory: refactoring 2020-12-21 17:01:36 +03:00
e197b05f07 Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4 2020-12-21 16:33:09 +03:00
62ce7a4c40 Web: Files: fixed download file 2020-12-21 16:32:59 +03:00
Artem Tarasov
17ac2f684d Web: Files: VersionHistory: added redirect to PannelView when window is resized 2020-12-21 16:07:02 +03:00
Vladislav Makhov
c1d975e3ad Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-21 15:29:50 +03:00
Vladislav Makhov
54354ada3c web: files: fix escape key press event 2020-12-21 15:29:28 +03:00
f4cd82f6f0 Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4 2020-12-21 15:28:43 +03:00
d90425af58 Web: Files: fixed create a file copy 2020-12-21 15:28:32 +03:00
Artem Tarasov
0a036a5343 Web: Files: VersionHistory: applied isTabletView flag, added redirect to a separate page if isTabletView = true 2020-12-21 15:22:23 +03:00
Vladislav Makhov
af6e67016d Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-21 14:18:44 +03:00
Vladislav Makhov
89f8195ab6 web: files: add notification, if create item with empty title 2020-12-21 14:18:32 +03:00
7c9a75a481 Files: fixed bunch query 2020-12-21 14:09:19 +03:00
Alexey Kostenko
551454683b Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-21 14:05:23 +03:00
Alexey Kostenko
cc4b91393a Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-21 14:04:57 +03:00
Alexey Kostenko
c949b160f9 Web: Files: DocEditor: Added meta data (favicon, title). Adding "*" when data is not saved. Changing title in DocEditor when changing filename 2020-12-21 14:04:40 +03:00
Vladislav Makhov
c8f6e4e5c8 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-21 14:02:24 +03:00
Vladislav Makhov
12758544c0 web: files: add handle special chars typing 2020-12-21 14:01:33 +03:00
60a4e56871 Web: Files: folders uploading is hidden on mobile devices 2020-12-21 13:50:40 +03:00
Alexey Kostenko
2183b6853b Web: Files: DocEditor: Fixed page height detection 2020-12-21 13:40:55 +03:00
Artem Tarasov
5f87b4555d Web: Files: VersionHistory: fix after merge develop 2020-12-21 13:27:13 +03:00
Artem Tarasov
bfd11ede79 Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
2020-12-21 13:15:43 +03:00
7c1b44e394 Web: Files: Added redirect to login on opening internal file link without cookie 2020-12-21 12:14:35 +03:00
Vladislav Makhov
32449024b4 web: files: set original title, if item rename was canceled. 2020-12-21 10:10:02 +03:00
Vladislav Makhov
75164013f2 web: files: remove ability to save document title with a whitespace 2020-12-21 10:04:05 +03:00
Vladislav Makhov
ac9666918e web: files: fix bug with selection 2020-12-18 19:13:49 +03:00
Alexey Kostenko
c4b1dfa3f5 Web: Files: Fixed internal media files link (on pages other than 1), and remove "preview" parameter from url after opening media viewer 2020-12-18 18:05:59 +03:00
Artem Tarasov
614d24b549 Web: Files: Settings: refactoring, fix firstLoad 2020-12-18 17:09:11 +03:00
Alexey Kostenko
61d2f93c48 Web: Files: Fixed a error when opening a media file by link 2020-12-18 16:24:25 +03:00
88c72052d3 Merge branch 'hotfix/v0.0.4' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.4 2020-12-18 15:44:13 +03:00
853f8fa8df Web: People: fixed access to the profile 2020-12-18 15:44:04 +03:00
Artem Tarasov
8c8a3d60f1 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-18 15:37:44 +03:00
Artem Tarasov
7d8a523caa Web: Files: Setiings: hidden settings connected clouds, fixed bug with getting settings 2020-12-18 15:37:31 +03:00
8f3de38301 Web: People: hid edit button if profile is disabled 2020-12-18 15:36:00 +03:00
Vladislav Makhov
dda45f3282 web: files: Hide header menu in favorites dir, when selected file removed from favorites 2020-12-18 14:24:28 +03:00
Vladislav Makhov
ee1eaf22ae Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-18 13:40:23 +03:00
Vladislav Makhov
eadac50389 web: files: added toasts for move/copy operations 2020-12-18 13:39:56 +03:00
Vladislav Makhov
f1bd691ed6 web: files: add translations for move/copy operations 2020-12-18 13:31:26 +03:00
Vladislav Makhov
3ab85035a0 web: files: fix icon of progress bar 2020-12-18 13:30:12 +03:00
Vladislav Makhov
d94c01cdd8 web: files: remove unused translations 2020-12-18 13:29:04 +03:00
Alexey Kostenko
c4a5bad014 Web: Files: SharingSettings: Added internal link for folder 2020-12-18 11:55:03 +03:00
Artem Tarasov
8886dd22a8 Web: Files: VersionHistory: fixed filter reset after returning from verion page 2020-12-18 11:30:17 +03:00
TatianaLopaeva
02949cc644 Web: People: Article: Deleted useless console.log. 2020-12-18 09:47:15 +03:00
f42fc72cf9 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-17 21:03:48 +03:00
53f510ae18 Bump version to v0.0.4 2020-12-17 21:00:36 +03:00
0ca5402bc6 Files: fixed new tag 2020-12-17 20:50:54 +03:00
TatianaLopaeva
def290f8eb Web: People: Fixed displaying of header (Android). 2020-12-17 20:16:26 +03:00
0e66177470 Files: refactoring 2020-12-17 19:39:31 +03:00
326d234773 Update yarn.lock files 2020-12-17 18:35:04 +03:00
Vladislav Makhov
e58e0c927b web: files: select input value, when edit or create item 2020-12-17 17:46:53 +03:00
de4e0de1ed Web: People: remove useless console.log from ProfileInfo 2020-12-17 17:40:10 +03:00
3b94449d03 Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3 2020-12-17 17:37:33 +03:00
42a496f442 Web: People: removed componentDidMount from filter, fixed profile group select 2020-12-17 17:37:22 +03:00
Vladislav Makhov
77ed5dd81e Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 17:21:33 +03:00
Vladislav Makhov
d195ca0a08 web: files: add toasts for delete operations 2020-12-17 16:12:32 +03:00
b96d62d72f Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3 2020-12-17 15:50:00 +03:00
0f1a43e0e7 Web: Files: fixed file read mark bug 2020-12-17 15:49:51 +03:00
Ilya Oleshko
3b31cd3248 Web: Files : Home: Fixed displaying context options for visitors 2020-12-17 15:20:52 +03:00
Vladislav Makhov
1e83731fbf Add translations 2020-12-17 15:20:51 +03:00
10cc974edf Merge branch 'hotfix/v0.0.3' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into hotfix/v0.0.3 2020-12-17 15:17:43 +03:00
9da7eb90b0 Web: People: fixed minDate, maxDate to profile dates 2020-12-17 15:17:32 +03:00
Alexey Kostenko
fb2b591603 Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 14:54:24 +03:00
6d1f0dbba8 Files: fixed flag "new" 2020-12-17 14:24:31 +03:00
Alexey Kostenko
159f8f9057 Web: Files: NewFilesPanel: Fixed styles 2020-12-17 13:34:07 +03:00
Diana
fada5e278b Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests 2020-12-17 13:20:52 +03:00
TatianaLopaeva
14e1d55ef9 Web: Files: Deleted debugger. 2020-12-17 13:18:34 +03:00
Ilya Oleshko
23cfe2032e Web: Files : Home: Fixed displaying shared buttons on share items 2020-12-17 13:09:53 +03:00
TatianaLopaeva
a7e4d814da Web: Common: Fixed unlocking by clicking on the icon. 2020-12-17 13:06:28 +03:00
c573e23b0b Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 12:37:41 +03:00
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
2b766b2862 Web: People: fixed Row checkedProps 2020-12-17 12:36:02 +03:00
Ilya Oleshko
2fe145d556 Web: People : Home : Fixed group menu out of screen 2020-12-17 12:19:18 +03:00
d849ac9c38 Web: People: Fixed empty phone and password inputs in ProfileAction 2020-12-17 12:08:57 +03:00
Vladislav Makhov
61aa6ac875 web: files: add toasts for item creation 2020-12-17 11:53:08 +03:00
Vladislav Makhov
b75316387b Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 11:21:50 +03:00
Vladislav Makhov
3ebbeb1ffc web: files: fix selection after rename item 2020-12-17 11:21:40 +03:00
91a9255bbc Web: People: fixed access to action menu 2020-12-17 11:11:12 +03:00
bc2bea064f Web: People: added minDate to DatePicker 2020-12-17 11:09:44 +03:00
02698ae515 Web: People: fixed GroupAction translations 2020-12-17 11:06:46 +03:00
41bca489bb Fixed versions (About version) 2020-12-16 19:09:56 +03:00
Diana
8fdaddd38d fix 2020-12-16 18:00:43 +03:00
Alexey Kostenko
59e0105bb6 Web: Files: NewFilesPanel: Fixed row style 2020-12-16 17:01:17 +03:00
Alexey Kostenko
0932517a57 Web: Files: NewFilesPanel: Fixed style 2020-12-16 16:07:21 +03:00
334c766052 Dao: any replaced with containts 2020-12-16 15:03:43 +03:00
f4b41b5111 Web: Files: fixed update of row after change of file owner 2020-12-16 11:46:45 +03:00
cbb0c75492 Web: Common: added employeeStatus to PeopleSelector 2020-12-16 11:37:50 +03:00
9ccc92f377 Web: Files: fixed getFilesList selector 2020-12-16 11:35:49 +03:00
e542f2b54e Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-15 17:59:18 +03:00
Artem Tarasov
78523a8d96 Merge branch 'develop' into bugfix/dropdown-fix 2020-12-15 15:39:22 +03:00
Diana
8f234d7418 fix 2020-12-15 14:08:07 +03:00
b0dd9c1400 Files: optimization 2020-12-15 13:29:53 +03:00
Vladislav Makhov
b748693676 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/App.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/Header/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Components/src/components/row/index.js
2020-12-15 11:00:54 +03:00
4027ca9599 Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-15 10:56:50 +03:00
cbc8888057 Merge branch 'develop' into feature/thirdparty-integrations 2020-12-15 10:55:15 +03:00
Artem Tarasov
a0f5261576 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-14 20:59:14 +03:00
Ilya Oleshko
8fd87415fd Web: Files : Home: Fixed downloading action 2020-12-14 18:21:45 +03:00
6ce69ef768 Web: Files: added change of file owner 2020-12-14 15:12:56 +03:00
ca9e7bd58a Web: Files: Fixed resize window 2020-12-14 15:11:34 +03:00
d428ec37c2 Web: Files: fixed setShareFiles action, added getCanShareOwnerChange selector 2020-12-14 15:08:41 +03:00
15420cb96b Web: Files: fixed ShareAccessRights constants 2020-12-14 15:06:24 +03:00
b06a6fb88c Web: Files: added OwnerChange translation 2020-12-14 15:05:09 +03:00
f232625ca4 Web: Files: Extended error toast 2020-12-14 14:57:18 +03:00
b1ad327e1c Web: Files: Fixed blocking popup on file creation by Enter in FF 2020-12-14 14:09:33 +03:00
Vladislav Makhov
10a8e7a039 Disable multiple sharing in private room 2020-12-14 13:05:51 +03:00
Vladislav Makhov
afb382d9d7 Add translation, when creating encrypted file 2020-12-14 11:06:36 +03:00
584c4e4b1a Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-14 10:57:14 +03:00
697ef7ed69 Web: Files: Refactoring of DocEditor page 2020-12-14 10:56:39 +03:00
c1c922f176 Web: Files: Removed useless api methods calls on DocEditor page 2020-12-14 10:54:27 +03:00
cc4fa01479 Web: Files: Removed displaying NavMenu loader on editor page 2020-12-14 10:51:58 +03:00
Vladislav Makhov
487ff234d9 Not to call callback for sharing encrypted file, when nothing changed 2020-12-14 10:26:39 +03:00
Vladislav Makhov
4e52155bbb Add translation, when sharing encrypted file 2020-12-14 09:58:05 +03:00
Vladislav Makhov
03e29cdec7 Remove unused code 2020-12-14 09:15:38 +03:00
Vladislav Makhov
7bd7928319 Fix items notification 2020-12-14 09:15:15 +03:00
ca26adf8e2 Web: Files: fixed onEditComplete 2020-12-11 17:21:38 +03:00
e8eb014a6f Files: fix download 2020-12-11 16:42:36 +03:00
Vladislav Makhov
81581d2199 Remove unused code 2020-12-11 16:34:55 +03:00
Ilya Oleshko
460b1ec0d9 Web: People : Home : Fixed fetch users after profile navigation 2020-12-11 16:03:48 +03:00
7a193e3ea0
Merge branch 'develop' into bugfix/dropdown-fix 2020-12-11 15:55:56 +03:00
6e0dd74e3e Merge branch 'release/v0.0.2' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into release/v0.0.2 2020-12-11 15:41:34 +03:00
0d7636d321 Web: Files: fixed dowload as 2020-12-11 15:41:16 +03:00
TatianaLopaeva
aa6eebb51b Web: Files/People: Home: Fixed the displaying load of section header 2020-12-11 14:21:37 +03:00
fa7d8e2010 Merge branch 'develop' into release/v0.0.2 2020-12-11 13:02:11 +03:00
Vladislav Makhov
25d43785d6 Replace number of root folder type id with constant 2020-12-11 12:09:16 +03:00
Vladislav Makhov
217a937b1e Hide new items notification in private room, then not in desktop 2020-12-11 12:06:22 +03:00
Ilya Oleshko
43346003fc Web: Files : Actions: Fixed wrong method on finish operation 2020-12-11 11:54:10 +03:00
0a775abb82 Files: optimization 2020-12-11 11:46:41 +03:00
f70e6e907f Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-11 11:34:23 +03:00
Ilya Oleshko
902cf95094 Web: Files : Home: Fixed action duplication on row 2020-12-11 10:17:25 +03:00
169c25d9bb Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-11 10:04:19 +03:00
Artem Tarasov
72a21a1def Merge branch 'develop' into bugfix/dropdown-fix 2020-12-10 20:46:24 +03:00
Artem Tarasov
e6dfb13d7d Web: Common/Components/Files: applied isAside prop for backdrop, fixed related bugs 2020-12-10 20:09:16 +03:00
8c4be9ab6d Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation 2020-12-10 19:15:44 +03:00
2548dba9b7 Web: Files: Fixed opening file on external link 2020-12-10 19:15:36 +03:00
356ace1c57 Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:14:58 +03:00
bd8d8c6a14 Merge branch 'bugfix/upload-with-convertation' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into bugfix/upload-with-convertation 2020-12-10 19:01:01 +03:00
72dd4c6bad Web: Files: fixed article width 2020-12-10 19:00:44 +03:00
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
4c9db8c0cb Web: Files: COMMENTED conversation functional 2020-12-10 18:24:19 +03:00
Vladislav Makhov
4110da78fa Prevent adding file to recently viewed in private room 2020-12-10 17:25:29 +03:00
Ilya Oleshko
5906b2f914 Merge branch 'develop' into feature/thirdparty-integrations 2020-12-10 16:25:44 +03:00
Viktor Fomin
d7d14b1bd2 Web: Common: show alert if convert error 2020-12-10 16:14:28 +03:00
dff5391b68 Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-10 15:07:14 +03:00
1a1417e20a Web: Files: fixed share link access rights 2020-12-10 14:46:57 +03:00
Alexey Kostenko
abda53a082 Web: Files/People/Common: Fixed header styles 2020-12-10 13:31:53 +03:00
a562631c3e Web: Files: removed useless code from sharing panel 2020-12-10 12:26:09 +03:00
82b6bc57bc Web: Files: moved advancedOptions to AccessComboBox 2020-12-10 12:14:34 +03:00
4eb4da95e6 Web: Files: removed useless sharing function, fixed sharingRow render 2020-12-10 11:17:01 +03:00
Vladislav Makhov
7658ec0603 Fix folder share button render 2020-12-10 11:04:52 +03:00
Alexey Kostenko
1a53841499 Web: Files/People/Common: Fixed header style 2020-12-10 09:48:35 +03:00
Diana
88a48348e0 Added Tests for Trash/Favorites/Recent folders 2020-12-10 00:07:08 +03:00
Diana
ca6454dc58 fix MyDocuments and Shared Documents 2020-12-10 00:06:16 +03:00
Viktor Fomin
60f11e4a18 Web: Files: fixed fileId 2020-12-09 19:38:00 +03:00
09ce302b57 Web: Files: Init new conversation process 2020-12-09 18:37:24 +03:00
Vladislav Makhov
cbf36ee893 Fix visibility of tree node expanded options, when private room is disabled 2020-12-09 17:14:27 +03:00
2e0762b2c3 Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-09 16:19:03 +03:00
8fbec9ea42 Web: Files: removed useless code, added new translations for sharing panel 2020-12-09 16:01:37 +03:00
4903bb4c91 Web: Files: Fixed uploading additional files when the upload has already started 2020-12-09 15:57:56 +03:00
962e9c8643 Web: Files: refactoring SharingPanel 2020-12-09 15:39:52 +03:00
c3b935e6b3 Web: Files: added AccessComboBox component 2020-12-09 15:39:01 +03:00
2da7ae5656 Web: Files: added new share translations 2020-12-09 15:38:08 +03:00
86325f87ba Web: Common: fixed sharing api 2020-12-09 15:37:34 +03:00
bd18aa1415 Web: Files: Re-written uploading process to async controlled chain calls 2020-12-09 13:54:04 +03:00
Artem Tarasov
6511557445 Web: Components/People: applied prop showDisabledItems 2020-12-09 13:09:41 +03:00
Vladislav Makhov
7f2577b3fa Fix encrypted icon style while editing 2020-12-09 11:26:24 +03:00
Artem Tarasov
fb10d00272 Web: Files/Components/Common/People: z-index fix 2020-12-09 10:59:04 +03:00
Viktor Fomin
c4cad309b3 Web: Files: fixed 2020-12-09 10:57:00 +03:00
Artem Tarasov
854acc0b1a Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-08 23:03:42 +03:00
8ac1a767bc Files: fix tests 2020-12-08 19:36:19 +03:00
4d88b2fc28 Update yarn.lock files 2020-12-08 18:37:19 +03:00
e4a43ff558 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 18:26:11 +03:00
Alexey Kostenko
0e2db11c9d Web: Files: SharingPanel: Added new access option - "FilterEditing" 2020-12-08 18:26:27 +03:00
ce4a3e3338 Update yarn.lock files 2020-12-08 18:17:46 +03:00
c8f7555017 Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2020-12-08 18:06:31 +03:00
Alexey Kostenko
bc5b17367c Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 17:45:40 +03:00
Alexey Kostenko
66e82c9206 Web: Files: Updated selector 2020-12-08 17:35:22 +03:00
Alexey Kostenko
92dfd37737 Web: Files: SharingPanel: Fixed possible access types of file 2020-12-08 17:31:01 +03:00
Viktor Fomin
ad2075c62e Web: Files: fixed folder jump 2020-12-08 16:25:21 +03:00
Vladislav Makhov
31ec802664 Delete dialog: delete encrypted file bypassing recycle bin 2020-12-08 16:14:29 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
42bfa9a3a6 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 15:12:42 +03:00
Vladislav Makhov
42c6242d6c Add encrypted file icon 2020-12-08 15:01:52 +03:00
Diana
8e7e14bdca fix shared documents 2020-12-08 14:55:31 +03:00
5e05907678 Web: Files: fixed getHeaderIndeterminate, getAccessedSelected selectors 2020-12-08 14:30:48 +03:00
Artem Tarasov
34d246deaf Web: Components/Files/People: z-index fix 2020-12-08 14:16:23 +03:00
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Ilya Oleshko
bd13067d0b Web: Added fast-deep-equal 2020-12-08 14:08:26 +03:00
Artem Tarasov
5446a6a24d Merge branch 'develop' into feature/version-hostory-redesign 2020-12-08 14:03:01 +03:00
Vladislav Makhov
fb465b3e05 Add security icon 2020-12-08 13:54:30 +03:00
a23909df51 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 13:53:31 +03:00
d50349765f Web: Files: fixed the visibility of the frame in the sharing panel 2020-12-08 13:40:24 +03:00
Artem Tarasov
52f0c1f96b Web: Components/Files: fix bugs, refactoring 2020-12-08 13:33:58 +03:00
Artem Tarasov
071f6c27c3 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-08 13:15:02 +03:00
47fb514642 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
2020-12-08 13:12:22 +03:00
f0d2e61f68 Web: Files: Refactoring 2020-12-08 13:11:19 +03:00
Vladislav Makhov
c5cdb58682 Modified privacy folder context menu 2020-12-08 13:01:10 +03:00
Vladislav Makhov
24961eb732 Hide folder share button in private room 2020-12-08 12:54:19 +03:00
Vladislav Makhov
be238b41c2 Disable share button in private room, when only folders selected 2020-12-08 12:53:44 +03:00
Vladislav Makhov
5fd757073f Fix result toast text of shared encrypted file 2020-12-08 12:27:57 +03:00
Vladislav Makhov
3aff383486 Add saving encrypted file toast 2020-12-08 12:25:25 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Vladislav Makhov
b0aab4ddb9 Add sharing of encrypted file 2020-12-08 11:51:39 +03:00
Alexey Kostenko
60cc94c06d Web: Files: SharingPanel: Refactoring 2020-12-08 11:08:38 +03:00
Viktor Fomin
e1947368bf Web: Files: fixed filter closing 2020-12-07 21:42:22 +03:00
Viktor Fomin
39e5119080 Web: Files: fixed filter closing 2020-12-07 21:16:53 +03:00
Viktor Fomin
d9e95dabab Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:07 +03:00
Viktor Fomin
c2e133553a Web: Files: fixed filter closing 2020-12-07 21:02:27 +03:00
Viktor Fomin
70086c5cb7 Merge branch 'feature/floating-button' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 20:21:06 +03:00
c48b5783f1 People: search ignore case 2020-12-07 19:56:59 +03:00
Viktor Fomin
342a02d9b4 Web: Files: fixed filter closing 2020-12-07 18:52:22 +03:00
Alexey Kostenko
ac5b23f23a Web: Files: Fixed determining the file format 2020-12-07 18:07:45 +03:00
Alexey Kostenko
10183ff90b Web: Files: Style fix, small refactoring 2020-12-07 16:58:02 +03:00