Commit Graph

1583 Commits

Author SHA1 Message Date
Vladislav Makhov
3064eb302b Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	web/ASC.Web.Common/src/pages/login/index.js
2020-12-03 09:59:20 +03:00
Vladislav Makhov
e911caf665 Creating encrypted file in desktop 2020-12-02 16:45:09 +03:00
Vladislav Makhov
95c13950cb Refactoring 2020-12-02 16:42:10 +03:00
Vladislav Makhov
293d545175 rename getEncryptionSupport to getIsEncryptionSupport 2020-12-02 16:41:52 +03:00
155b23f799 Files: GetSecurityInfo 2020-12-02 16:17:43 +03:00
303abad2a4 Files: change owner 2020-12-01 22:59:42 +03:00
f1f1ae818e Files: fix long operation 2020-12-01 12:29:08 +03:00
8de24eae99 Files: openedit. AllowAnonymous 2020-12-01 10:20:15 +03:00
6f76404eaa Files: optimization 2020-11-30 23:02:10 +03:00
645749fbc7 Files: rename ParentFolderID to FolderId.
Optimization
2020-11-30 16:47:26 +03:00
Vladislav Makhov
813c9c4b1d Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-11-30 15:16:49 +03:00
f10f6b8d3b Update yarn.lock files 2020-11-30 15:11:23 +03:00
8c965fa4e1 Web: People: changed empty screen description, fixed icons alignment 2020-11-28 13:44:31 +03:00
12542c137c Remove todo 2020-11-27 17:06:26 +03:00
b4e071081c todo 2020-11-27 16:42:27 +03:00
95ba0185db Web: Files: fixed files row metadata 2020-11-26 17:07:43 +03:00
Vladislav Makhov
fba407c5cb Add props for privacy 2020-11-26 15:44:43 +03:00
Vladislav Makhov
c22f9b7f3f Add setEncryptionAccess 2020-11-26 15:42:12 +03:00
56fc822099 Web: Files: removed files row metadata 2020-11-26 15:11:44 +03:00
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
Vladislav Makhov
06342cf27b Fix upload dialog 2020-11-24 10:11:47 +03:00
Vladislav Makhov
c3cba3a0af Remove unused code 2020-11-24 10:11:25 +03:00
Vladislav Makhov
baaaef7b80 Refactoring 2020-11-23 17:28:24 +03:00
Vladislav Makhov
84ea70264f Fix filter data 2020-11-23 17:27:55 +03:00
af77fa0f24
Merge branch 'develop' into bugfix/filter-fix 2020-11-20 16:19:52 +03:00
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
be081c45b6 Files: fixed share folder 2020-11-20 13:45:42 +03:00
Artem Tarasov
56d2286f63 Merge branch 'develop' into bugfix/filter-fix 2020-11-20 13:09:04 +03:00
b5a66444d7 Thirdparty: fix save 2020-11-20 12:24:17 +03:00
Vladislav Makhov
1f01a3b308 Add encryptionUploadDialog 2020-11-20 11:48:35 +03:00
0337bd58da Files: fixed DI 2020-11-20 10:22:15 +03:00
2a222a94fc Thirdparty: fix save 2020-11-19 22:17:45 +03:00
5aef0e809e Files: fix get share 2020-11-19 21:48:16 +03:00
1ddb6804ed Files: fix share thirdparty 2020-11-19 21:47:40 +03:00
Vladislav Makhov
52515b2a3c Refactoring 2020-11-19 18:30:29 +03:00
Artem Tarasov
be094640fe Web: Files: Filter: fixed names of sorting items 2020-11-19 13:22:09 +03:00
2ceb845808 Thirdparty: fix copy 2020-11-19 11:30:00 +03:00
Vladislav Makhov
47554e4f1a Refactoring 2020-11-18 20:22:52 +03:00
93410996f0 Merge branch 'develop' into refactoring/files-thirdparty 2020-11-18 15:19:36 +03:00
2909d9d240 Thirdparty: refactoring security, tag 2020-11-18 13:37:11 +03:00
3c19fda2de Thirdparty: refactoring security 2020-11-18 11:28:43 +03:00
20d37596cf Files: fix share 2020-11-17 22:36:27 +03:00
0c520416fa Files: remove cache 2020-11-17 21:17:23 +03:00
f11a11d470 Thirdparty: refactoring 2020-11-17 17:56:36 +03:00
903abca3a8 Thirdparty: refactoring 2020-11-17 17:41:42 +03:00
1b03c87157 Thirdparty: refactoring 2020-11-17 17:08:54 +03:00
2c945b0414
Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-17 11:18:59 +03:00
121f34946b Files: added base "Only in TMFileDao" methods 2020-11-17 11:13:53 +03:00
Alexey Kostenko
3702bd597d Web: Common: Refactoring HOC withLayoutSize 2020-11-17 10:32:02 +03:00