Commit Graph

8897 Commits

Author SHA1 Message Date
Vladislav Makhov
72b9a10e82 Fix dispatch error 2020-12-04 12:13:51 +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
ef92cf1cae File: fix FileStreamModel 2020-12-03 18:15:35 +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
Vladislav Makhov
eb6fe0d417 Operation panel fix for Private room 2020-12-03 16:21:00 +03:00
Vladislav Makhov
b8b454a438 Modified header menu for Private Room 2020-12-03 15:54:29 +03:00
Vladislav Makhov
f240c8da00 Modified context menu for Private Room 2020-12-03 14:23:08 +03:00
Vladislav Makhov
f188489c06 Refactoring 2020-12-03 12:12:14 +03:00
Vladislav Makhov
45ca67e7b8 Add form data 2020-12-03 12:11:52 +03:00
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
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
155b23f799 Files: GetSecurityInfo 2020-12-02 16:17:43 +03:00
303abad2a4 Files: change owner 2020-12-01 22:59:42 +03:00
9b611dee3c Auth. ia auth: allow anonymous 2020-12-01 16:40:38 +03:00
f1f1ae818e Files: fix long operation 2020-12-01 12:29:08 +03:00
88117bcd00 Authentication: read method 2020-12-01 11:22:10 +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
2959acb262
Merge pull request #142 from ONLYOFFICE/bugfix/empty-login-ios
Bugfix/empty login ios
2020-11-30 15:53:55 +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
325e548ee3 web: common: bump version 2020-11-30 15:03:14 +03:00
d0abe7666f Common: Fixed empty screen on login page on IOS 2020-11-30 15:02:57 +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