Commit Graph

8872 Commits

Author SHA1 Message Date
Vladislav Makhov
925a619a2f Refactoring, add replaceFileStream 2020-12-02 16:43:28 +03:00
Vladislav Makhov
1fbdd82dae Add updateFileStream, rename getEncryptionSupport to getIsEncryptionSupport 2020-12-02 16:42:45 +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
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
Alexey Kostenko
f3a6696040
Merge pull request #141 from ONLYOFFICE/bugfix/fix-empty-screen-description
Bugfix/fix empty screen description
2020-11-30 13:49:22 +03:00
4ad116937a Merge branch 'develop' into bugfix/fix-empty-screen-description 2020-11-30 13:27:35 +03:00
Ilya Oleshko
5c3ab4650c
Merge pull request #140 from ONLYOFFICE/bugfix/alignment-and-colors-fix
Bugfix/alignment and colors fix
2020-11-30 12:54:00 +03:00
c029a2df04 Web: People: fixed text alignment 2020-11-30 12:15:45 +03:00
5e10d983f3 Web: Components: fixed display of tooltip in password input 2020-11-28 15:36:33 +03:00
8c965fa4e1 Web: People: changed empty screen description, fixed icons alignment 2020-11-28 13:44:31 +03:00
d280c474ac Web: Components: fixed date-picker styled, refactoring 2020-11-28 13:25:01 +03:00
b65ef058e1 Web: Components: fixed alignment of icons 2020-11-28 13:21:02 +03:00
f1b4176527 Web: Components: fixed alignment of icons 2020-11-28 13:16:25 +03:00
a0adc29899 Web: People: fixed alignment and color of icons 2020-11-28 13:15:30 +03:00
bc1e8e80a8 Web: Components: Grid: fixed gridColumnGap prop, added export 2020-11-28 13:13:28 +03:00
a6174d184c Web: Components: added default color prop to help-button 2020-11-28 13:10:58 +03:00
a22742671d Web: Components: fixed input-block icons size 2020-11-28 13:09:56 +03:00
165001aad8 Web: Components: fixed tree-menu catalog color 2020-11-28 13:09:08 +03:00
97e033ac68 Web: Components: fixed text alignment in the buttons 2020-11-28 13:06:57 +03:00
83e4db1e7f Web: People: removed useless buttons styles 2020-11-28 13:05:10 +03:00
2b7480a200 Web: People: fixed headers fontWeight 2020-11-28 13:03:53 +03:00
13757f9dae Web: Components: updated icons 2020-11-28 13:01:18 +03:00
d7e64dfb8f
Merge pull request #139 from ONLYOFFICE/bugfix/register-block
Bugfix/register block
2020-11-27 19:17:58 +03:00
18a29f66dd
Merge branch 'develop' into bugfix/register-block 2020-11-27 19:02:08 +03:00
Vladislav Makhov
38fac0b348 web: common: fix styles 2020-11-27 18:44:27 +03:00
Vladislav Makhov
25a4032a2a web: common: revert commit 2020-11-27 18:43:51 +03:00
Vladislav Makhov
3e58e6d7c0 web: common: add styled wrapper 2020-11-27 18:43:22 +03:00
Vladislav Makhov
d1524afa5a web: common: remove unused code 2020-11-27 18:42:46 +03:00
Vladislav Makhov
7569475bbb web: common: move Register to Login 2020-11-27 18:02:48 +03:00
Vladislav Makhov
8b8abad778 web: client: remove Register from App.js 2020-11-27 17:53:34 +03:00
Vladislav Makhov
5f733577d9 web: common: fix enableJoin prop 2020-11-27 17:48:10 +03:00
12542c137c Remove todo 2020-11-27 17:06:26 +03:00
Vladislav Makhov
4daa055d38 Merge branch 'develop' into bugfix/register-block 2020-11-27 16:59:19 +03:00
Vladislav Makhov
e46d755520 web: common: update prop types 2020-11-27 16:57:19 +03:00
Vladislav Makhov
83385dd2e4 web: common: bump version 2020-11-27 16:55:31 +03:00
Vladislav Makhov
c6cc0f0a1f web: client: fix register block view 2020-11-27 16:55:12 +03:00
Vladislav Makhov
65976a3b75 web: common: fix register block view 2020-11-27 16:55:00 +03:00
b4e071081c todo 2020-11-27 16:42:27 +03:00
Ilya Oleshko
897b8172df
Merge pull request #138 from ONLYOFFICE/bugfix/files-row-fix
Bugfix/files row fix
2020-11-27 11:08:07 +03:00
d2a3382b17 web: components: bump version 2020-11-27 10:59:15 +03:00
2210f0f6ba Web: Components: fixed row icons alignment 2020-11-27 10:58:30 +03:00
95ba0185db Web: Files: fixed files row metadata 2020-11-26 17:07:43 +03:00
3272910d8e web: components: bump version 2020-11-26 16:46:58 +03:00
dc5e2ff4a2 Web: Components: fixed icons in row-content 2020-11-26 16:43:31 +03:00
Vladislav Makhov
eb4f643230 Modified getEncryptionAccess 2020-11-26 15:45:52 +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
Ilya Oleshko
0c6a4fceef
Merge pull request #137 from ONLYOFFICE/bugfix/password-input-fix
Bugfix/password input fix
2020-11-26 12:52:22 +03:00