Commit Graph

17025 Commits

Author SHA1 Message Date
21f85e7260 logger refactoring. added resolver ILog/IOptionsMonitor<ILog> 2022-03-17 09:55:08 +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
e58d3324f2 Files: renamed api parameters 2022-03-05 17:41:47 +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
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
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
fd7ce85667
Merge pull request #542 from ONLYOFFICE/feature/refactoring-VoipService
refactoring: voipService
2022-03-05 10:50:54 +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
ea8e68c950 add ssoAuth.bat with yarn install 2022-03-04 16:50:12 +03:00
fd04cd9474
Merge pull request #533 from ONLYOFFICE/feature/refactoring-update-editorconfig
Feature/refactoring: update editorconfig
2022-03-04 16:39:13 +03:00
51cd7232a3
Merge pull request #544 from ONLYOFFICE/feature/refactoring-Textile
refactoring: texttile
2022-03-04 16:28:57 +03:00
f234fd1cfd fix warning 2022-03-04 14:22:35 +03:00
d54a542852 Merge branch 'feature/backend-refactor' into feature/refactoring-update-editorconfig 2022-03-04 14:03:20 +03:00
eed7efc81b new rules 2022-03-04 14:01:54 +03:00
1d398d47f6 Merge branch 'feature/backend-refactor' into feature/files-refactor 2022-03-04 13:25:12 +03:00
2c526259d3 winsw: update
fix names
add start mode
remove log settings (don't work. always create log how like "append" mode)
add stop before uninstall
2022-03-04 12:14:46 +03:00
a4891f136a
Merge pull request #570 from ONLYOFFICE/feature/asc-files-core-refactor
Feature/asc files core refactor
2022-03-03 23:12:19 +03:00
3d2d6b12e6 Files: removed unnecessary usings 2022-03-03 21:19:52 +03:00
f82d9ffaf8 Files: used WebApplicationBuilder, implicit usings 2022-03-03 21:15:48 +03:00
99f0f702f8 Files: refactor 2022-03-03 21:01:34 +03:00
ee027f8508 Files: rremoved unnecessary 2022-03-03 20:55:16 +03:00
c827c628c5 Files: separated controllers 2022-03-03 20:33:11 +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
4e08a6f2cf Files: fix 2022-03-03 14:25:09 +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
0600452b87 People: renamed 2022-03-02 21:24:45 +03:00
e1646b0e75
Merge pull request #546 from ONLYOFFICE/feature/refactoring-studio.notify
refactoring: studio.notify
2022-03-01 21:11:13 +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
a73606f1f9 Files: used implicit usings 2022-03-01 17:26:30 +03:00