|
|
5bcc792132
|
Merge branch 'feature/license-refactor' of github.com:ONLYOFFICE/AppServer into feature/license-refactor
|
2022-03-21 10:37:02 +03:00 |
|
|
|
da31770f18
|
added deleted license headers
|
2022-03-21 10:36:07 +03:00 |
|
|
|
679aecbc76
|
Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
|
2022-03-20 16:47:31 +03:00 |
|
|
|
868492b562
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2022-03-19 22:16:03 +03:00 |
|
|
|
61f4f33990
|
fixed DistributedTask
|
2022-03-19 18:48:51 +03:00 |
|
|
|
1c74b5702b
|
Files:fix notify
|
2022-03-19 18:05:26 +03:00 |
|
|
|
21a8c0e0fc
|
removed httpclient ctor
|
2022-03-18 22:34:01 +03:00 |
|
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
|
|
82daaf4029
|
rename model to inDto
|
2022-03-15 13:56:22 +03:00 |
|
|
|
5c820fdcd5
|
Index: create index only in service
|
2022-03-14 21:47:34 +03:00 |
|
|
|
d930c91fb1
|
Merge branch 'feature/backend-refactor' into feature/winsw
# Conflicts:
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj
# common/services/ASC.UrlShortener.Svc/GlobalUsings.cs
|
2022-03-09 21:08:00 +03:00 |
|
|
|
b9719755be
|
Added ThrowIfNull
|
2022-03-09 20:15:51 +03:00 |
|
|
|
6b262e915a
|
socket.io:delete redis in config
|
2022-03-09 16:53:36 +03:00 |
|
|
|
263aa1e8ce
|
check isAbsolute path for appsettings and logs
|
2022-03-09 15:49:16 +03:00 |
|
|
|
78fafb08ab
|
Microsoft.NET.Sdk.Worker
|
2022-03-05 18:38:42 +03:00 |
|
|
|
1cd153eabe
|
SocketIO: fix hosts
|
2022-03-05 16:41:18 +03:00 |
|
|
|
475269ee84
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileShareWrapper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2022-03-05 11:27:58 +03:00 |
|
|
|
99378a027e
|
Csproj: ImplicitUsings
|
2022-03-05 11:20:05 +03:00 |
|
|
|
fb83a54871
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-03-05 10:44:39 +03:00 |
|
|
|
4a61f9fce5
|
VoipService: refactor mapping
|
2022-03-04 19:35:12 +03:00 |
|
|
|
51cd7232a3
|
Merge pull request #544 from ONLYOFFICE/feature/refactoring-Textile
refactoring: texttile
|
2022-03-04 16:28:57 +03:00 |
|
|
|
418ca246c8
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.People/Server/Startup.cs
|
2022-03-03 14:35:22 +03:00 |
|
|
|
1b352c76f6
|
Added using AddControllers method
|
2022-03-03 14:04:17 +03:00 |
|
|
|
5f68d00182
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-03 11:22:16 +03:00 |
|
|
|
7403540435
|
DI: fixed path issue. Added faster method for registering controllers
|
2022-03-03 11:04:21 +03:00 |
|
|
|
6a8b5a8ed5
|
Merge branch 'feature/backend-refactor' into feature/refactoring-studio.notify
|
2022-03-01 19:46:13 +03:00 |
|
|
|
708d2f3ecc
|
Feed: fix mapping
|
2022-03-01 19:45:27 +03:00 |
|
|
|
4e30cda54e
|
Studio.Notify: fixed start
|
2022-03-01 19:43:43 +03:00 |
|
|
|
6070a93f1d
|
Merge branch 'feature/backend-refactor' into feature/refactoring-studio.notify
# Conflicts:
# common/services/ASC.Studio.Notify/Program.cs
|
2022-03-01 19:26:56 +03:00 |
|
|
|
61a127413c
|
delete svc projects
|
2022-03-01 15:54:23 +03:00 |
|
|
|
bfded42b52
|
Merge branch 'feature/backend-refactor' into feature/winsw
|
2022-03-01 15:31:33 +03:00 |
|
|
|
b48bd37ea6
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-01 15:27:07 +03:00 |
|
|
|
f77b210524
|
fix warning
|
2022-03-01 13:37:36 +03:00 |
|
|
|
fe77e0a331
|
fix build
|
2022-03-01 13:36:34 +03:00 |
|
|
|
e8b673eb29
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common
|
2022-03-01 11:17:12 +03:00 |
|
|
|
6d3a0e2d82
|
Merge branch 'feature/backend-refactor' into feature/refactoring-telegram-service
|
2022-03-01 10:56:21 +03:00 |
|
|
|
8474cb8d37
|
refactor
|
2022-02-28 23:25:25 +03:00 |
|
|
|
c887362ea3
|
People: separated people controller
|
2022-02-28 22:23:39 +03:00 |
|
|
|
1665fe7bf6
|
People: refactor
|
2022-02-28 21:54:08 +03:00 |
|
|
|
d0b7bd63b6
|
textile: delete prefix "s" and ImplicitUsings
|
2022-02-28 18:12:10 +03:00 |
|
|
|
f34e89cce8
|
telegram: CancellationToken to StartReceiving()
|
2022-02-28 16:11:54 +03:00 |
|
mushka
|
ce73a703a4
|
added drag-scrolling, working on auto-offset
|
2022-02-28 16:08:11 +03:00 |
|
|
|
34a9067aec
|
refactoring: remove whitespace
|
2022-02-28 15:45:01 +03:00 |
|
|
|
d7d7d18ec8
|
voipService: add autoMapper and fix method "GetCallsQuery"
|
2022-02-28 15:43:20 +03:00 |
|
|
|
fe15811c8f
|
Core: refactor
|
2022-02-28 12:06:06 +03:00 |
|
|
|
37b6a61462
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-02-28 11:40:58 +03:00 |
|
|
|
3e8164e146
|
refactoring: telegram service
|
2022-02-28 11:35:59 +03:00 |
|
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
|
0635eea567
|
Merge pull request #549 from ONLYOFFICE/feature/asc-notify-textile-refactor
Feature/asc notify textile refactor
|
2022-02-25 18:19:22 +03:00 |
|
