b4c44d1b09
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
2022-03-21 19:03:57 +03:00
010697ec97
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix
...
Bugfix/refactoring fix
2022-03-21 17:54:54 +04:00
3e4e1bf0b0
Merge pull request #588 from ONLYOFFICE/feature/license-refactor
...
Feature/license refactor
2022-03-21 17:51:42 +04:00
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
d207bcee3a
added missing method
2022-03-18 13:38:40 +03:00
5cfe7e08ec
added registration mapping converters
2022-03-18 13:31:02 +03:00
fe9962167e
CRM: fix build
2022-03-16 17:19:34 +03:00
c62bd4a6d1
fix
2022-03-15 22:05:54 +03:00
65db98f65c
added new license headers
2022-03-15 21:00:53 +03:00
370471a7d2
added header in editorconfig
2022-03-15 20:46:36 +03:00
3d50d7977b
removed past license headers
2022-03-15 19:59:24 +03:00
f5eaedadc1
Merge pull request #568 from ONLYOFFICE/feature/web.api-refactoring
...
Feature/web.api refactoring
2022-03-15 18:28:18 +03:00
7bb1f0c755
Files: added DownloadModelBinder
2022-03-15 16:47:37 +03:00
07bacab25d
fix merge: ThrowIfNull
2022-03-15 14:12:29 +03:00
5dd68fee6c
automapper instead of ToSmtpSettings
2022-03-15 14:11:19 +03:00
82daaf4029
rename model to inDto
2022-03-15 13:56:22 +03:00
82aac7c696
rename dtos
2022-03-15 13:00:41 +03:00
0019a8fd3e
Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
2022-03-15 12:51:15 +03:00
5c820fdcd5
Index: create index only in service
2022-03-14 21:47:34 +03:00
882507496d
added new routing mechanism
2022-03-14 13:57:59 +03:00
69a6ed4d46
Bugfix/packages correction ( #583 )
...
* Add templates
* Add a launch of the configuration script to the postinst
* Edit OneClickInstall for new changes
* Correct appserver-configuration.sh
* chown fix
* Correction debconf-set-selections
* Fix the launch of services after installation
* test
* Correction for database values
* Add variables for mysql configuration
* Revert "test"
This reverts commit 85e5050eb2cfeb1b3723076e44ec0819e0889142.
* Add launch of zookeeper and kafka services
2022-03-14 11:26:24 +03:00
8ee71f5574
Merge pull request #576 from ONLYOFFICE/feature/files-refactor
...
Feature/files refactor
2022-03-10 13:50:20 +03:00
43dc4c8a98
Merge pull request #571 from ONLYOFFICE/feature/winsw
...
Feature/winsw
2022-03-10 13:00:38 +03:00
c9f8064224
Merge branch 'feature/backend-refactor' into feature/files-refactor
2022-03-10 12:31:05 +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
0f3ce16f85
create new winsw.exe
...
fix logs
2022-03-09 14:34:28 +03:00
b1664fd2e5
Files: renamed helper
2022-03-08 20:43:47 +03:00
358ea18086
Files: divided files controller helper
2022-03-08 20:37:23 +03:00
78fafb08ab
Microsoft.NET.Sdk.Worker
2022-03-05 18:38:42 +03:00
24773009c3
Merge pull request #569 from ONLYOFFICE/feature/people-refactor
...
Feature/people refactor
2022-03-05 18:25:57 +03:00
4b27512ef8
Merge pull request #575 from ONLYOFFICE/refactoring/refactoring-context-menu
...
Refactoring/refactoring context menu
2022-03-05 17:42:50 +03:00
e58d3324f2
Files: renamed api parameters
2022-03-05 17:41:47 +03:00
1a9ced4901
Web: Files: fixed context menu opening
2022-03-05 17:36:04 +03:00
1cd153eabe
SocketIO: fix hosts
2022-03-05 16:41:18 +03:00
bededa43f7
Merge branch 'feature/people-refactor' of github.com:ONLYOFFICE/AppServer into feature/people-refactor
2022-03-05 16:28:52 +03:00
9add54cf6b
People: renamed api params
2022-03-05 16:20:51 +03:00
51475c0c51
People: removed engines
2022-03-05 15:57:46 +03:00
3b9a099996
Merge branch 'develop' into refactoring/refactoring-context-menu
2022-03-05 15:47:14 +03:00
1b5d5882a7
Merge pull request #578 from ONLYOFFICE/feature/slider-redesign
...
Feature/slider redesign
2022-03-05 15:45:57 +03:00
d035deba31
Merge branch 'feature/backend-refactor' into feature/files-refactor
...
# Conflicts:
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
2022-03-05 11:50:42 +03:00
ce57be48c1
Api: fixed usings
2022-03-05 11:43:36 +03:00
