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 |
|
|
|
8c965fa4e1
|
Web: People: changed empty screen description, fixed icons alignment
|
2020-11-28 13:44:31 +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 |
|
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 |
|
Vladislav Makhov
|
1f01a3b308
|
Add encryptionUploadDialog
|
2020-11-20 11:48:35 +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 |
|
Vladislav Makhov
|
47554e4f1a
|
Refactoring
|
2020-11-18 20:22:52 +03:00 |
|
Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
e65f2b36c7
|
Web: Files: Filter: Changed Consumer to HOC
|
2020-11-17 06:33:34 +03:00 |
|
Vladislav Makhov
|
0e6e97ca0c
|
Fix empty screen
|
2020-11-16 17:04:17 +03:00 |
|
Vladislav Makhov
|
9929aa36de
|
Add getEncryptionSupport data handling
|
2020-11-16 15:44:13 +03:00 |
|
Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
Vladislav Makhov
|
07d507b5c5
|
Added receive of encryption keys
|
2020-11-16 12:34:01 +03:00 |
|
Vladislav Makhov
|
b33b8268a1
|
Refactoring
|
2020-11-13 19:05:49 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
97d9d58a29
|
Web: Files: added header loader
|
2020-11-12 13:30:54 +03:00 |
|
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
Viktor Fomin
|
d2a30544d6
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-11 17:38:10 +03:00 |
|
Viktor Fomin
|
91bc88ad28
|
Update yarn.lock files
|
2020-11-11 17:37:48 +03:00 |
|
Viktor Fomin
|
2cc252c2ae
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 16:42:22 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +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 |
|
Viktor Fomin
|
40e2d85dbd
|
Update yarn.lock files
|
2020-11-11 13:27:17 +03:00 |
|
Vladislav Makhov
|
a3d2ead825
|
Merge branch 'develop' into feature/desktop-view
|
2020-11-11 11:22:11 +03:00 |
|
Alexey Kostenko
|
e29eeb2f4b
|
Web: Common/Client: FilterInput: Added sectionWidth prop
|
2020-11-11 07:27:42 +03:00 |
|
Viktor Fomin
|
0852dd0814
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-10 18:25:25 +03:00 |
|
Viktor Fomin
|
237084a749
|
Web: Files: fix first loader
|
2020-11-10 18:20:42 +03:00 |
|
Viktor Fomin
|
df4c89cb91
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 18:09:58 +03:00 |
|
Viktor Fomin
|
0490c8c3f0
|
Update yarn.lock files
|
2020-11-10 18:08:51 +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 |
|
Viktor Fomin
|
9cbe89d4b5
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 11:02:29 +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 |
|
Viktor Fomin
|
834e8e6516
|
Update yarn.lock files
|
2020-11-10 10:46:26 +03:00 |
|
Viktor Fomin
|
067ee4fc5a
|
Web: Files: delete first header preloader
|
2020-11-10 10:40:17 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Viktor Fomin
|
515bd0d05f
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-09 23:02:18 +03:00 |
|
Viktor Fomin
|
a7dee56194
|
Update yarn.lock files
|
2020-11-09 23:01:57 +03:00 |
|
