Commit Graph

8960 Commits

Author SHA1 Message Date
Vladislav Makhov
217a937b1e Hide new items notification in private room, then not in desktop 2020-12-11 12:06:22 +03:00
Vladislav Makhov
4110da78fa Prevent adding file to recently viewed in private room 2020-12-10 17:25:29 +03:00
Vladislav Makhov
7658ec0603 Fix folder share button render 2020-12-10 11:04:52 +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
Vladislav Makhov
509ce245ac Comment out shouldComponentUpdate (temporary) 2020-12-09 11:30:21 +03:00
Vladislav Makhov
7f2577b3fa Fix encrypted icon style while editing 2020-12-09 11:26:24 +03:00
Vladislav Makhov
31ec802664 Delete dialog: delete encrypted file bypassing recycle bin 2020-12-08 16:14:29 +03:00
Vladislav Makhov
42c6242d6c Add encrypted file icon 2020-12-08 15:01:52 +03:00
Vladislav Makhov
fb465b3e05 Add security icon 2020-12-08 13:54:30 +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
Vladislav Makhov
b0aab4ddb9 Add sharing of encrypted file 2020-12-08 11:51:39 +03:00
Vladislav Makhov
9c2238ad60 Comment out shouldComponentUpdate (temporary) 2020-12-07 17:33:01 +03:00
Vladislav Makhov
7ff435e5be Fix circular dependencies 2020-12-07 17:32:00 +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
Vladislav Makhov
c94ff1ab41 Add sharing encrypted file options 2020-12-07 14:14:04 +03:00
dbc30ff4ce
Merge pull request #145 from ONLYOFFICE/bugfix/login-fix
Bugfix/login fix
2020-12-07 13:42:42 +03:00
a2f1bada5e
Merge branch 'develop' into bugfix/login-fix 2020-12-07 13:26:55 +03:00
Ilya Oleshko
4147d2f31a Web: Fixed temp loaders 2020-12-07 11:11:04 +03:00
9b559a6df0 Files: fix get share info 2020-12-07 11:02:37 +03:00
Ilya Oleshko
830fbfb6a3 web: common: bump version 2020-12-07 09:52:39 +03:00
Ilya Oleshko
049f7971f1 web: components: bump version 2020-12-07 09:52:29 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
Ilya Oleshko
cd100eba85 Web: Client: Fixed redirect after actions 2020-12-07 09:43:40 +03:00
2baf8cbc76 Fixed confirm link user creation 2020-12-04 17:15:00 +03:00
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
0784453daf Fix errors on login and logout 2020-12-04 14:21:51 +03:00
d39c2524c3 Files: refactoring 2020-12-04 13:52:07 +03:00
Vladislav Makhov
a3bd0823c6 Refactoring 2020-12-04 12:59:48 +03:00
Vladislav Makhov
18bec4ee4b fix updateFileStream 2020-12-04 12:59:16 +03:00
Vladislav Makhov
d7fd6aecdb Remove unused code 2020-12-04 12:57:32 +03:00
Vladislav Makhov
72b9a10e82 Fix dispatch error 2020-12-04 12:13:51 +03:00
Ilya Oleshko
c32fc83399 Web: Client: Fixed property name, added missing property 2020-12-04 11:58:15 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00
Ilya Oleshko
0f1c50a765
Merge pull request #143 from ONLYOFFICE/bugfix/new-files-panel-fix
Bugfix/new files panel fix
2020-12-04 11:06:34 +03:00
5291c2b11c Merge branch 'develop' into bugfix/new-files-panel-fix 2020-12-04 10:58:05 +03:00
Vladislav Makhov
af6a1a8c73 Merge branch 'develop' into feature/desktop-view 2020-12-04 08:16:42 +03:00
9ddb7c4d0e Files: fix upload 2020-12-03 21:42:39 +03:00
73ffc6104d Merge branch 'develop' into bugfix/new-files-panel-fix 2020-12-03 18:26:02 +03:00
ef92cf1cae File: fix FileStreamModel 2020-12-03 18:15:35 +03:00
4574c6172a web: components: bump version 2020-12-03 18:10:05 +03:00
aa3cf1df49 web: common: bump version 2020-12-03 18:09:55 +03:00
b5807c695d Web: Files: refactoring panels styles 2020-12-03 18:05:58 +03:00
a39192ff21 Web: Common: added new containers styles, added classNames to people and files containers 2020-12-03 18:03:05 +03:00
d4e5208115 Web: Components: removed margin-top from row-container 2020-12-03 18:00:16 +03:00
d39b0743fd Files: fix GetSecurityInfo 2020-12-03 17:50:17 +03:00
34f8d17b84 Files: set files securityinfo 2020-12-03 17:43:33 +03:00