Commit Graph

16975 Commits

Author SHA1 Message Date
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
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
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
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
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
4e08a6f2cf Files: fix 2022-03-03 14:25:09 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
7403540435 DI: fixed path issue. Added faster method for registering controllers 2022-03-03 11:04:21 +03:00
4805ea2178 Api: fix warnings 2022-03-02 11:08:59 +03:00
3ffeeab926 Merge branch 'feature/backend-refactor' into feature/web.api-refactoring 2022-03-02 10:47:46 +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
0cf7b005d1 Merge branch 'feature/backend-refactor' into feature/asc-files-core-refactor 2022-03-01 17:06:27 +03:00
7a669f9293 Files: refactor 2022-03-01 16:10:58 +03:00
cfbfe84d11 ImplicitUsings 2022-03-01 14:44:13 +03:00
e2c86852a0 remove whitespace 2022-03-01 14:35:29 +03:00
e18d6b8757 refactoring: asc.web.api 2022-03-01 13:58:02 +03:00
f77b210524 fix warning 2022-03-01 13:37:36 +03:00
fe77e0a331 fix build 2022-03-01 13:36:34 +03:00
e7259608d1 rename dto 2022-03-01 13:03:56 +03:00
0ff56392f8 rename and replace models 2022-03-01 13:03:56 +03:00
c3742208cc replace controllers 2022-03-01 13:03:25 +03:00
3974eabfad
Merge pull request #557 from ONLYOFFICE/feature/asc-core-common-refactor
Feature/asc core common refactor
2022-03-01 11:18:30 +03:00
e8b673eb29 Merge branch 'feature/backend-refactor' into feature/asc-core-common 2022-03-01 11:17:12 +03:00
ae414db669
Merge pull request #545 from ONLYOFFICE/feature/refactoring-telegram-service
refactoring: telegram service
2022-03-01 11:07:15 +03:00
6d3a0e2d82 Merge branch 'feature/backend-refactor' into feature/refactoring-telegram-service 2022-03-01 10:56:21 +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
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
d5c55fc384 FilesCore: reorganize dto 2022-02-28 14:26:29 +03:00
b56260bc38 FilesCore: Models to ApiModels 2022-02-28 14:15:31 +03:00
49a4c9e570 FilesCore: modet to dto 2022-02-28 14:06:30 +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