IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,662 Commits 40 Branches 22 Tags 420 MiB
5a5e299d98
Commit Graph

206 Commits

Author SHA1 Message Date
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
24224a7437 Files: fix rename folders. fix favorites 2021-09-30 21:26:01 +03:00
pavelbannov
d27160cf98 Fix mobile app requests 2021-09-28 14:41:35 +03:00
pavelbannov
90bb2ef44a fixed bearer 2021-09-24 12:08:10 +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
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +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
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
610e31ec3b fixed equals 2021-08-20 19:04:55 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00
pavelbannov
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
pavelbannov
16469eb138 Api: added ConfigureNLogLogging 2021-08-08 15:56:54 +03:00
pavelbannov
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
Vashchuk Nikita
b70c2e6f09 fix 2021-08-03 19:26:28 +03:00
pavelbannov
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
Vashchuk Nikita
3c8fadc28d modified WebhooksMiddleware 2021-07-29 15:39:22 +03:00
Vashchuk Nikita
b913cdc813 Added WebhooksIdentifier.cs 2021-07-28 18:16:56 +03:00
Vashchuk Nikita
afdd1ab982 Added CustomMiddleware(WebhooksMiddleware.cs) 2021-07-28 13:10:14 +03:00
NikolayRechkin
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
pavelbannov
1268a436ca Startup: fix load products 2021-07-16 11:56:14 +03:00
pavelbannov
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
pavelbannov
7e6e25274f Api: fix confirm 2021-07-10 20:27:15 +03:00
pavelbannov
a23b23de3c Startup: added ability to skip load products and consumers 2021-06-24 11:15:20 +03:00
Alexey Bannov
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
pavelbannov
3788bab48e HealthCheck: fix Studio 2021-06-22 19:55:47 +03:00
Alexey Bannov
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate 
Feature/crm migrate
 2021-06-16 17:02:46 +03:00
Alexey Bannov
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
Viktor Fomin
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
Alexey Bannov
2018820472 Merge branch 'develop' into feature/crm-migrate 2021-05-31 19:37:51 +03:00
pavelbannov
3e6cc50323 Api: error custom messages 2021-05-31 18:08:55 +03:00
Vashchuk Nikita
82abf11109 Merge branch 'develop' into feature/calendar 
# Conflicts:
#	ASC.Web.sln
#	config/autofac.products.json
#	config/nginx/onlyoffice.conf
#	products/ASC.Calendar/Server/ASC.Calendar.csproj
#	products/ASC.Calendar/Server/Controllers/CalendarController.cs
#	products/ASC.Calendar/Server/Program.cs
#	products/ASC.Calendar/Server/Properties/launchSettings.json
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
#	products/ASC.Calendar/Server/Startup.cs
 2021-05-18 13:24:02 +03:00
Alexey Bannov
92ce702b28 crm: refactoring. bugfix 2021-05-05 17:09:05 +03:00
Viktor Fomin
261e6d8b4c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-05 15:09:59 +03:00
Alexey Bannov
c86257cf67 Merge branch 'develop' into feature/crm-migrate 2021-05-04 11:25:27 +03:00
Alexey Bannov
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
Alexey Bannov
8816e535c1 merge from develop 2021-04-28 19:50:59 +03:00
Viktor Fomin
38ed10ccb8 Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-04-28 11:13:01 +03:00
pavelbannov
f4d091135c ConfirmAuth: auth by email 2021-04-27 20:27:23 +03:00
NikitaVashchuk
3eb3cef5a3 fix 2021-04-20 10:55:52 +03:00
AlexeySafronov
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
pavelbannov
226792cc42 Files: fixed tests 2021-04-14 14:51:17 +03:00
Alexey Bannov
8ff27ff1be added ControllerNameAttributeConvention 2021-04-02 18:46:00 +03:00
Alexey Bannov
c0582c1130 merge from develop 2021-04-01 16:28:36 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00