Commit Graph

8509 Commits

Author SHA1 Message Date
Vladislav Makhov
668b29b138 Fix checkPsw 2020-11-13 15:58:14 +03:00
Vladislav Makhov
7936fa6578 Refactoring 2020-11-12 19:03:54 +03:00
Vladislav Makhov
8d30c4b173 Refactoring, add getEncryptionKeys action 2020-11-12 19:01:31 +03:00
Vladislav Makhov
a6339582a5 Made header visible on desktop (temporary) 2020-11-12 19:00:43 +03:00
Vladislav Makhov
1aab4e3295 Refactoring 2020-11-12 11:50:21 +03:00
Vladislav Makhov
0c549c5e0c Add getEncryptionKeys callback 2020-11-12 11:49:44 +03:00
Vladislav Makhov
ce42fb6106 Add key "encryptionKeys" to reducer 2020-11-12 11:49:09 +03:00
Vladislav Makhov
05886cb391 Merge branch 'feature/desktop-view' of github.com:ONLYOFFICE/AppServer into feature/desktop-view 2020-11-11 15:52:55 +03:00
85e7eb38be Privacy:getkeys method 2020-11-11 15:50:03 +03:00
Vladislav Makhov
fd93f234d0 Refactoring 2020-11-11 15:47:37 +03:00
Vladislav Makhov
53b2461d4f Desktop helper init 2020-11-11 15:47:25 +03:00
Vladislav Makhov
2c872d2506 Add selector 2020-11-11 15:47:00 +03:00
Vladislav Makhov
a3d2ead825 Merge branch 'develop' into feature/desktop-view 2020-11-11 11:22:11 +03:00
Vladislav Makhov
73359b5049 Add several callbacks 2020-11-10 17:37:44 +03:00
Vladislav Makhov
cc828a69bd Add actions 2020-11-10 17:05:59 +03:00
9aba8ec982
Merge pull request #120 from ONLYOFFICE/hotfix/documents-bugfix
Hotfix/documents bugfix
2020-11-10 14:52:52 +03:00
Artem Tarasov
02aed65d60 Web: Files: DocEditor: fixed of mobile view 2020-11-10 14:29:59 +03:00
Artem Tarasov
4031a609b8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
Artem Tarasov
f578e43662 Web: Files: Settings: refactoring 2020-11-10 13:31:16 +03:00
Vladislav Makhov
c45466bfe5 Add working with privacyroom/access/{fileId} 2020-11-10 12:57:05 +03:00
Vladislav Makhov
4a55bd9b81 Add working with privacyroom/keys 2020-11-10 12:54:05 +03:00
4458bca039 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-10 11:21:34 +03:00
6947185bab Files: refactoring 2020-11-10 11:21:22 +03:00
Vladislav Makhov
3415cc046c Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-11-10 11:02:14 +03:00
ccf8eb8e59
Merge pull request #118 from ONLYOFFICE/feature/third-party-settings
Feature/third party settings
2020-11-10 10:51:01 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Vladislav Makhov
633a5415c0 Fix url 2020-11-10 08:14:56 +03:00
Artem Tarasov
2f19e504aa Web: Components: refactoring css rule, deleted incorrect description 2020-11-09 19:02:40 +03:00
Ilya Oleshko
d169eeac26
Merge pull request #121 from ONLYOFFICE/feature/creating-redirect
Feature/creating redirect
2020-11-09 19:01:46 +03:00
Artem Tarasov
066140f388 Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal 2020-11-09 18:59:06 +03:00
Vladislav Makhov
0df2b1e956 web: common: bump version 2020-11-09 18:48:08 +03:00
Artem Tarasov
57ca2d2603 Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file 2020-11-09 18:33:45 +03:00
Ilya Oleshko
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +03:00
Ilya Oleshko
82a2520150 Web: Files : Body : Fixed preload tab for new documents 2020-11-09 18:29:06 +03:00
3c38343063 Fix download.
fix thirdparty
2020-11-09 17:46:49 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
Vladislav Makhov
21234d6a39 Remove unused data 2020-11-09 16:24:32 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
Vladislav Makhov
7c6d5a9e54 Add translation 2020-11-09 15:58:58 +03:00
Vladislav Makhov
8ac2ad73d6 Fix title 2020-11-09 15:31:24 +03:00
Vladislav Makhov
cdaa816b36 Fix Help center link 2020-11-09 15:27:07 +03:00
Artem Tarasov
46ed4741a6 Web: Files/Components: deleted console.log, unusing code, refactoring 2020-11-09 15:23:20 +03:00
Artem Tarasov
11d91fe21f Web: Files/Components: tree-menu: fixed selection 2020-11-09 15:16:15 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Vladislav Makhov
eeced56986 Refactoring 2020-11-09 13:03:18 +03:00
Artem Tarasov
c2dfeb591c web: common: bump version 2020-11-09 12:43:27 +03:00
Artem Tarasov
9aedb02748 web: components: bump version 2020-11-09 12:43:20 +03:00
Artem Tarasov
4482f70cd3 Web: Files: VersionHistory: added arrow-button in header 2020-11-09 12:42:41 +03:00