|
eb6b54482e
|
fix warnings
|
2020-11-17 13:47:17 +03:00 |
|
|
1623241d8a
|
Code cleanup
|
2020-11-17 13:00:01 +03:00 |
|
|
d2a0d318f7
|
dotnet 5
|
2020-11-17 12:59:15 +03:00 |
|
|
75fce656f0
|
Merge branch 'develop' into feature/dotnet5
|
2020-11-17 11:31:14 +03:00 |
|
|
f37d40442f
|
Merge pull request #128 from ONLYOFFICE/feature/files-zip
Feature/files zip
|
2020-11-17 11:09:14 +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 |
|
|
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 |
|
|
a66f99f574
|
net5.0
|
2020-11-15 18:55:57 +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 |
|
|
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 |
|
|
47020b7a01
|
Merge pull request #117 from ONLYOFFICE/feature/filter-loader
Feature/files loader
|
2020-11-13 13:29:20 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +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 |
|
|
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 |
|
Viktor Fomin
|
f66fc4c7ba
|
Web: Client: fix
|
2020-11-12 14:36:42 +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 |
|
Viktor Fomin
|
4d34d8c964
|
Web: Common: fix header loader in nav menu
|
2020-11-12 02:26:21 +03:00 |
|
Viktor Fomin
|
9303703685
|
Web: Common: fix header loader
|
2020-11-12 02:25:34 +03:00 |
|
Viktor Fomin
|
80cdbe643e
|
Web: Common: delete loader box
|
2020-11-12 00:42:14 +03:00 |
|
Viktor Fomin
|
a801fcb603
|
Web: Common: fix logo loading
|
2020-11-12 00:32:40 +03:00 |
|
Viktor Fomin
|
3dc69fc9e8
|
Web: People: added group loader
|
2020-11-12 00:12:28 +03:00 |
|
Viktor Fomin
|
e52c7d45b2
|
Web: Common: export group loader
|
2020-11-12 00:12:12 +03:00 |
|
Viktor Fomin
|
e7e8c6cb88
|
Web: Common: created group loader
|
2020-11-12 00:10:41 +03:00 |
|
Viktor Fomin
|
45e9ab5aea
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 23:26:03 +03:00 |
|
|
7ad7cab1d3
|
Merge pull request #123 from ONLYOFFICE/hotfix/section-loader
Hotfix/section loader
|
2020-11-11 22:19:04 +03:00 |
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
|
8c7d0746cd
|
web: common: bump version
|
2020-11-11 21:55:43 +03:00 |
|
|
c4411f7b00
|
Merge branch 'develop' into hotfix/section-loader
|
2020-11-11 21:54:02 +03:00 |
|
SuhorukovAnton
|
9039c810c5
|
x-www-form-urlencoded: fix
|
2020-11-11 18:36:58 +03:00 |
|
|
1c6c47cbf2
|
nginx: fix
|
2020-11-11 18:02:38 +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
|
0b4d99c6ae
|
web: common: bump version
|
2020-11-11 17:33:02 +03:00 |
|
Viktor Fomin
|
a7b7fa4e75
|
Web: Common: fix
|
2020-11-11 17:32:38 +03:00 |
|
Viktor Fomin
|
2cc252c2ae
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 16:42:22 +03:00 |
|
|
a556b8bd97
|
Merge pull request #124 from ONLYOFFICE/bugfix/aside-fix
Fixed aside
|
2020-11-11 16:27:17 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +03:00 |
|
Artem Tarasov
|
bcd4744798
|
web: components: bump version
|
2020-11-11 16:05:34 +03:00 |
|