IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,237 Commits 38 Branches 22 Tags 359 MiB
0771a54c47
Commit Graph

1316 Commits

Author SHA1 Message Date
pavelbannov
5eab8516f8 EF: removed unused class 2021-10-22 12:30:06 +03:00
pavelbannov
36db823276 removed unused class 2021-10-22 11:54:45 +03:00
pavelbannov
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
SuhorukovAnton
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
SuhorukovAnton
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
pavelbannov
ed8487e99f Webhook: format 2021-10-19 19:53:28 +03:00
pavelbannov
5a5e299d98 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
 2021-10-19 18:30:59 +03:00
pavelbannov
9f12c95828 Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks 2021-10-19 15:25:53 +03:00
Ilya Oleshko
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
Ilya Oleshko
9dd28a144d Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
pavelbannov
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
Alexey Bannov
803a8f3baa fixed bug 53156: removed constructor without HttpContextAccessor parameter. 2021-10-14 18:36:31 +03:00
Alexey Bannov
a324b8b9b9 fixed bug 52923 for s3 storage 2021-10-13 16:23:54 +03:00
SuhorukovAnton
735a9b60cf net6: warning CA1416 
also remove unnecessary usings
 2021-10-13 11:07:03 +03:00
pavelbannov
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
MaksimChegulov
f5a25b80be update migrations 2021-10-12 17:54:11 +03:00
MaksimChegulov
0fb10454ca refactor 2021-10-12 17:51:36 +03:00
MaksimChegulov
24f658754f refactor 2021-10-12 17:51:13 +03:00
MaksimChegulov
4c972a48c2 changed last migration searching logic 2021-10-12 17:50:42 +03:00
MaksimChegulov
9db8371344 add contexts search for all providers 2021-10-12 17:48:33 +03:00
MaksimChegulov
1a7021d6c4 move to directories 2021-10-12 17:45:12 +03:00
MaksimChegulov
a19dfef1ab update postgresql migrations 2021-10-12 13:25:56 +03:00
MaksimChegulov
55da5e7c54 add postgresql model configuring 2021-10-12 13:24:19 +03:00
MaksimChegulov
1ddbb41052 rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
SuhorukovAnton
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
MaksimChegulov
b483025437 add provider name property 2021-10-12 12:43:49 +03:00
MaksimChegulov
9541b9e6b4 optimization migration 2021-10-12 12:04:24 +03:00
MaksimChegulov
94c81d11d1 add generation migration name logic 2021-10-11 17:34:11 +03:00
MaksimChegulov
494a201a0b cosmetic changes 2021-10-11 17:25:25 +03:00
MaksimChegulov
243a2cb55f update migration 2021-10-11 17:24:15 +03:00
MaksimChegulov
8b4d793d78 remove unnecessary HasData 2021-10-11 17:23:39 +03:00
MaksimChegulov
0066585554 replace DateTime.Now to fixed DateTime 2021-10-11 17:23:02 +03:00
MaksimChegulov
73624e0aed add auto migration creator 2021-10-07 12:52:35 +03:00
MaksimChegulov
8ced3a052a change access modificator 2021-10-07 12:51:29 +03:00
MaksimChegulov
040f3065c5 fix 2021-10-07 12:51:10 +03:00
MaksimChegulov
6cc771bb87 fix 2021-10-07 12:50:57 +03:00
MaksimChegulov
814fe65535 fix 2021-10-07 12:49:55 +03:00
SuhorukovAnton
05b2c63543 net6: warning SYSLIB0013 2021-10-07 12:05:32 +03:00
SuhorukovAnton
1ac44d3c92 net6: warning SYSLIB0021 2021-10-07 12:03:13 +03:00
SuhorukovAnton
7a380542aa net6: warning SYSLIB0023 2021-10-07 12:00:26 +03:00
pavelbannov
498a896322 fix Bug 50254 2021-10-05 22:28:07 +03:00
SuhorukovAnton
8409b10705 net6: warning SYSLIB0022 2021-10-01 13:34:47 +03:00
SuhorukovAnton
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
pavelbannov
24224a7437 Files: fix rename folders. fix favorites 2021-09-30 21:26:01 +03:00
pavelbannov
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
pavelbannov
d27160cf98 Fix mobile app requests 2021-09-28 14:41:35 +03:00
pavelbannov
e755d2eda8 renamed providers to lowercase 2021-09-24 17:36:46 +03:00
pavelbannov
90bb2ef44a fixed bearer 2021-09-24 12:08:10 +03:00
pavelbannov
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
pavelbannov
f4feb48d2c fix dependencies 2021-09-22 19:51:06 +03:00
pavelbannov
d32f555706 ResManager: fix 2021-09-17 16:46:24 +03:00
diana-vahomskaya
a5e1609dac two methods 2021-09-16 11:25:17 +03:00
pavelbannov
ea4fa97838 Merge branch 'develop' into feature/wizard/migration 
# Conflicts:
#	ASC.Tests.sln
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
#	common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
#	common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
 2021-09-15 15:52:13 +03:00
pavelbannov
ec66a65d38 User: fix request 2021-09-10 17:00:26 +03:00
pavelbannov
2e20b4958d fix CookieAuthHandler 2021-09-08 13:16:58 +03:00
pavelbannov
51d905abc6 Cookie: logout after failed auth 2021-09-07 22:58:01 +03:00
pavelbannov
5a5bb8fb25 Merge branch 'develop' into release/1.0.0 2021-09-05 22:59:31 +03:00
pavelbannov
1e77063d32 fix Bug 51866 2021-09-05 22:59:14 +03:00
pavelbannov
d099326e7f Merge branch 'develop' into feature/backup.core 
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
 2021-09-05 12:50:05 +03:00
pavelbannov
ec7fcd34b3 Merge branch 'develop' into release/1.0.0 2021-09-03 18:07:09 +03:00
pavelbannov
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
pavelbannov
d78195aa5a Added notify 2021-09-03 18:04:06 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
pavelbannov
0970b1b420 Merge branch 'develop' into release/1.0.0 2021-09-02 23:50:18 +03:00
pavelbannov
211224ca1a Storage: fix S3 2021-09-02 23:49:59 +03:00
SuhorukovAnton
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00
SuhorukovAnton
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
Ilya Oleshko
fa204303f5 Merge branch 'develop' into release/1.0.0 2021-09-01 16:08:41 +03:00
SuhorukovAnton
d8654444c6 backup.core: fix 2021-08-31 16:59:32 +03:00
SuhorukovAnton
115d752582 backup.core: fix 2021-08-31 15:43:40 +03:00
SuhorukovAnton
a812971c07 Merge branch 'develop' into feature/backup.core 2021-08-31 13:55:47 +03:00
SuhorukovAnton
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
pavelbannov
f62209d88e Merge branch 'develop' into feature/webhooks 2021-08-30 19:18:18 +03:00
pavelbannov
a84bddad3c fix 2021-08-30 19:17:57 +03:00
pavelbannov
2addb81adf Quota: Price2 removed 2021-08-30 18:19:20 +03:00
Vashchuk Nikita
5e6bd9ee5f fix 2021-08-27 18:33:21 +03:00
Vashchuk Nikita
0521d8af09 fix 2021-08-27 17:50:49 +03:00
Vashchuk Nikita
d66600b6c7 fix 2021-08-27 10:50:52 +03:00
Vashchuk Nikita
e5b40b3d0c fix ASC.Webhooks.Tests 2021-08-27 00:15:47 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
pavelbannov
dd9e5e9b5d Merge branch 'develop' into feature/webhooks 2021-08-26 15:17:53 +03:00
pavelbannov
14e8c59b17 Merge branch 'develop' into release/1.0.0 2021-08-25 21:17:41 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
Vashchuk Nikita
c41361bdd8 fix 2021-08-24 11:08:58 +03:00
pavelbannov
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
Vashchuk Nikita
c851641b6c Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks 2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
pavelbannov
a471a19dfd Merge branch 'develop' into release/1.0.0 2021-08-23 11:50:35 +03:00
pavelbannov
610e31ec3b fixed equals 2021-08-20 19:04:55 +03:00
pavelbannov
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
pavelbannov
9207238d8d Merge branch 'develop' into release/1.0.0 2021-08-20 16:12:40 +03:00
pavelbannov
9f83801f88 Nlog: optimization 2021-08-20 15:42:43 +03:00
pavelbannov
91fd7615b3 Optimization 2021-08-20 10:52:52 +03:00
Vashchuk Nikita
3dc5ca5afc Merge branch 'develop' into feature/webhooks 2021-08-19 15:58:57 +03:00
pavelbannov
0745110a44 Test: fix 2021-08-19 15:58:25 +03:00
Vashchuk Nikita
66be58c759 fix 2021-08-19 15:56:14 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
5e72bcc224 fix 2021-08-19 13:17:54 +03:00
Vashchuk Nikita
2859d05ce3 fix 2021-08-19 12:25:43 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00