Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
c6d4b5bf60
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 08:11:35 +03:00 |
|
Alexey Kostenko
|
ee26c7c148
|
web: common: bump version
|
2020-11-17 08:11:11 +03:00 |
|
Alexey Kostenko
|
8db2b5b3d0
|
Web: Common: Code cleaning
|
2020-11-17 08:05:47 +03:00 |
|
Alexey Kostenko
|
99ae4dba20
|
Web: People: Changed Consumer to HOC
|
2020-11-17 06:39:08 +03:00 |
|
Alexey Kostenko
|
e65f2b36c7
|
Web: Files: Filter: Changed Consumer to HOC
|
2020-11-17 06:33:34 +03:00 |
|
Alexey Kostenko
|
32e633cee9
|
Web: Common: Added HOC withLayoutSize
|
2020-11-17 06:29:24 +03:00 |
|
|
|
fda6d3cdc5
|
Merge branch 'develop' into feature/files-zip
|
2020-11-16 21:38:00 +03:00 |
|
|
|
7866ba1212
|
Files: removed dependencies
|
2020-11-16 21:30:33 +03:00 |
|
|
|
77fec89a0f
|
Files: DotNetZip replaced with SharpCompress
|
2020-11-16 19:41:14 +03:00 |
|
|
|
141165903b
|
Test: fix
|
2020-11-16 17:58:27 +03:00 |
|
Vladislav Makhov
|
ec8bec93c8
|
Refactoring
|
2020-11-16 17:42:29 +03:00 |
|
|
|
c7ff6e4af5
|
Merge pull request #126 from ONLYOFFICE/refactoring/scope
Refactoring/scope
|
2020-11-16 17:22:08 +03:00 |
|
|
|
cd523404f1
|
Merge branch 'develop' into refactoring/scope
|
2020-11-16 17:09:19 +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
|
74f0cd2c48
|
Refactoring
|
2020-11-16 12:34:18 +03:00 |
|
Vladislav Makhov
|
07d507b5c5
|
Added receive of encryption keys
|
2020-11-16 12:34:01 +03:00 |
|
Vladislav Makhov
|
8f5027418c
|
Refactoring
|
2020-11-16 12:32:21 +03:00 |
|
Alexey Kostenko
|
c58d720db2
|
web: common: bump version
|
2020-11-16 09:05:54 +03:00 |
|
Alexey Kostenko
|
4b2848d639
|
Web: Common: FilterInput: Fixed bug with reset sorting
|
2020-11-16 08:10:07 +03:00 |
|
|
|
f328484bac
|
Thumbnails: updated winston
|
2020-11-15 18:42:47 +03:00 |
|
|
|
7c228a78e5
|
Files: fix create file in thirdparty
|
2020-11-15 18:34:47 +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 |
|
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
Vladislav Makhov
|
668b29b138
|
Fix checkPsw
|
2020-11-13 15:58:14 +03:00 |
|
|
|
47020b7a01
|
Merge pull request #117 from ONLYOFFICE/feature/filter-loader
Feature/files loader
|
2020-11-13 13:29:20 +03:00 |
|
Alexey Kostenko
|
bfecfc31d3
|
web: common: bump version
|
2020-11-13 10:58:50 +03:00 |
|
Alexey Kostenko
|
df060ba8a2
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-13 10:58:34 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +03:00 |
|
Alexey Kostenko
|
969f7e5c4f
|
Web: Common: FilterInput: Refactoring
|
2020-11-13 10:26:14 +03:00 |
|
|
|
335f4f2fe7
|
Merge pull request #119 from ONLYOFFICE/bugfix/x-www-form-urlencoded
Bugfix/x www form urlencoded
|
2020-11-13 10:08:33 +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 |
|
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Viktor Fomin
|
02081905e8
|
web: common: bump version
|
2020-11-12 15:01:46 +03:00 |
|
Viktor Fomin
|
2df7830782
|
Web: Common: fix unauth logo loader
|
2020-11-12 15:01:38 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Viktor Fomin
|
f66fc4c7ba
|
Web: Client: fix
|
2020-11-12 14:36:42 +03:00 |
|
Alexey Kostenko
|
9d6ad1538e
|
Web: Common: FilterInput: Fixed warning
|
2020-11-12 14:18:36 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
5ef5ea5d0c
|
web: common: bump version
|
2020-11-12 13:32:37 +03:00 |
|
Viktor Fomin
|
9a7237aea0
|
Web: Client: added header loader
|
2020-11-12 13:31:48 +03:00 |
|
Viktor Fomin
|
0bb00e39db
|
Web: People: added header loader
|
2020-11-12 13:31:19 +03:00 |
|
Viktor Fomin
|
97d9d58a29
|
Web: Files: added header loader
|
2020-11-12 13:30:54 +03:00 |
|
