Vladislav Makhov
|
74f0cd2c48
|
Refactoring
|
2020-11-16 12:34:18 +03:00 |
|
Vladislav Makhov
|
8f5027418c
|
Refactoring
|
2020-11-16 12:32:21 +03:00 |
|
Vladislav Makhov
|
c2a398f8a5
|
Refactoring
|
2020-11-13 21:45:28 +03:00 |
|
Vladislav Makhov
|
9f4aecfee8
|
Fix HeaderNav dropdown when desktop
|
2020-11-13 21:39:49 +03:00 |
|
Vladislav Makhov
|
b33b8268a1
|
Refactoring
|
2020-11-13 19:05:49 +03:00 |
|
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
|
fd93f234d0
|
Refactoring
|
2020-11-11 15:47:37 +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 |
|
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 |
|
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 |
|
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 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Vladislav Makhov
|
0df2b1e956
|
web: common: bump version
|
2020-11-09 18:48:08 +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 |
|
Vladislav Makhov
|
078bb238fd
|
Add url to store
|
2020-11-09 16:15:36 +03:00 |
|
Vladislav Makhov
|
fee439b390
|
Refactoring
|
2020-11-09 15:11:46 +03:00 |
|
Artem Tarasov
|
c2dfeb591c
|
web: common: bump version
|
2020-11-09 12:43:27 +03:00 |
|
Artem Tarasov
|
3c557194df
|
Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows
|
2020-11-09 12:38:35 +03:00 |
|
Artem Tarasov
|
612661a22b
|
Web: Files/Common: MainButton: fixed line-height
|
2020-11-06 16:43:14 +03:00 |
|
Artem Tarasov
|
c791fa29aa
|
Web: Files/Common: PageLayout: fixed margin-top in Header
|
2020-11-06 16:15:03 +03:00 |
|
Artem Tarasov
|
d8a384adba
|
web: common: bump version
|
2020-11-06 14:23:37 +03:00 |
|
Artem Tarasov
|
173017ddbb
|
Web: Common: AdvancedSelector: fixed layout
|
2020-11-06 12:48:08 +03:00 |
|
Artem Tarasov
|
678d31cc32
|
Web: Common: GroupSelector: fixed placeholder
|
2020-11-05 23:59:44 +03:00 |
|
Vladislav Makhov
|
cc252ecac2
|
Add window.cloudCryptoCommand
|
2020-11-05 17:54:55 +03:00 |
|
Vladislav Makhov
|
9a3bc3b655
|
Add desktop commands
|
2020-11-05 14:13:06 +03:00 |
|
Artem Tarasov
|
91019b19bd
|
web: common: bump version
|
2020-11-05 11:50:08 +03:00 |
|
Artem Tarasov
|
481abf40f8
|
Web: Common: applied prop size for Avatar Component
|
2020-11-05 11:39:09 +03:00 |
|
|
04003a0fa4
|
Web: Common: update lock file
|
2020-11-03 17:26:47 +03:00 |
|
Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
Artem Tarasov
|
8507650485
|
Web: Common: PageLayout: fixed selection items
|
2020-11-03 12:23:46 +03:00 |
|
Vladislav Makhov
|
6e5c425d6b
|
Add method
|
2020-11-03 11:07:00 +03:00 |
|
Vladislav Makhov
|
63b706714b
|
Merge branch 'develop' into feature/desktop-view
|
2020-11-03 10:07:21 +03:00 |
|
Vladislav Makhov
|
2afb10a135
|
Refactoring
|
2020-11-03 09:52:05 +03:00 |
|
Artem Tarasov
|
5f6e0e60e8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
|
2020-11-02 13:36:03 +03:00 |
|
|
440395d341
|
Web: Common: fixed update main height timeout
|
2020-10-30 17:22:49 +03:00 |
|
Vladislav Makhov
|
f4e5ada7af
|
Hide header nav, when desktop
|
2020-10-30 16:43:51 +03:00 |
|
Vladislav Makhov
|
94062cbd63
|
fix error
|
2020-10-30 16:06:21 +03:00 |
|
Vladislav Makhov
|
89d01e0b0b
|
Refactoring
|
2020-10-30 15:32:56 +03:00 |
|
Ilya Oleshko
|
bf879ce810
|
web: common: bump version
|
2020-10-30 14:25:22 +03:00 |
|
Ilya Oleshko
|
797afe5c72
|
Web: Common: changed ReactResizeDetector refreshRate
|
2020-10-30 14:24:24 +03:00 |
|