Commit Graph

17044 Commits

Author SHA1 Message Date
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
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
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
ce57be48c1 Api: fixed usings 2022-03-05 11:43:36 +03:00
ac9c1bf409 Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/GlobalUsings.cs
2022-03-05 11:41:27 +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
960c6f5449 Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
#	web/ASC.Web.Api/Startup.cs
2022-03-03 14:53:23 +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