Commit Graph

1373 Commits

Author SHA1 Message Date
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
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
Alexey Kostenko
159f8f9057 Web: Files: NewFilesPanel: Fixed styles 2020-12-17 13:34:07 +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
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
Vladislav Makhov
61aa6ac875 web: files: add toasts for item creation 2020-12-17 11:53:08 +03:00
Vladislav Makhov
3ebbeb1ffc web: files: fix selection after rename item 2020-12-17 11:21:40 +03:00
41bca489bb Fixed versions (About version) 2020-12-16 19:09:56 +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
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
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
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
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
Vladislav Makhov
81581d2199 Remove unused code 2020-12-11 16:34:55 +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
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
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
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
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
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
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
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
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
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
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
Vladislav Makhov
2c1c8dedb0 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
2020-12-07 16:03:47 +03:00
Alexey Kostenko
eb4f5c2085 Web: Files: Removed link highlighting on click 2020-12-07 15:36:50 +03:00
Viktor Fomin
982ce4e12c
Merge branch 'develop' into feature/floating-button 2020-12-07 14:50:49 +03:00
Viktor Fomin
2be2085655 Update yarn.lock files 2020-12-07 14:48:09 +03:00
Viktor Fomin
04a009543d Web: Common: fixed folder id 2020-12-07 14:43:00 +03:00
Alexey Kostenko
bc8efccf1b Web: Files: SharingPanel: Style fix 2020-12-07 14:34:41 +03:00
Vladislav Makhov
c94ff1ab41 Add sharing encrypted file options 2020-12-07 14:14:04 +03:00
Alexey Kostenko
98e1d94ea7 Web: Files: Fixed header style 2020-12-07 13:52:57 +03:00
Alexey Kostenko
149adcc372 Merge branch 'develop' into bugfix/sharing-settings 2020-12-07 13:44:42 +03:00
Viktor Fomin
f8dcb6c59e Web: Files: fixed uploading files, added refresh files 2020-12-07 13:20:07 +03:00
Viktor Fomin
b693cbdd4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 13:19:32 +03:00
Ilya Oleshko
4147d2f31a Web: Fixed temp loaders 2020-12-07 11:11:04 +03:00
Alexey Kostenko
4264345556 Web: Files: Fixed styles in EmbeddingPanel 2020-12-07 10:40:59 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
Alexey Kostenko
b822342387 Web: Files: SharingPanel: Fixed clickable area in combo button in peopleSelector/groupSelector 2020-12-07 09:33:16 +03:00
Alexey Kostenko
744898d94d Web: Files: Style fix 2020-12-04 16:54:13 +03:00
Alexey Kostenko
e6483213d5 Web: Files: Removed dropdown in internal link icon, style fix 2020-12-04 15:56:39 +03:00
Artem Tarasov
93da24a63a Web: Common/Files/People: fixed z-index 2020-12-04 14:58:37 +03:00
0784453daf Fix errors on login and logout 2020-12-04 14:21:51 +03:00
Alexey Kostenko
ab71a6dd33 Web: Files/Common: Refactoring, changing access type to external share link 2020-12-04 14:09:31 +03:00
Vladislav Makhov
a3bd0823c6 Refactoring 2020-12-04 12:59:48 +03:00
Vladislav Makhov
d7fd6aecdb Remove unused code 2020-12-04 12:57:32 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00
Alexey Kostenko
32651dd4d5 Web: Files: Fixed the method for determining access options 2020-12-04 09:48:37 +03:00
Viktor Fomin
fcb7ecc071 Web: Files: fixed uploading files 2020-12-03 19:22:46 +03:00
Alexey Kostenko
14031d121e Web: Files/Common: Style fix 2020-12-03 18:14:11 +03:00
b5807c695d Web: Files: refactoring panels styles 2020-12-03 18:05:58 +03:00