Commit Graph

17201 Commits

Author SHA1 Message Date
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
4c92e6f0d3 Common: fix mapper for generic types 2022-03-04 13:57:43 +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
4e08a6f2cf Files: fix 2022-03-03 14:25:09 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
23fca4c041 Web: Components: fixed context-menu model 2022-03-03 12:56:51 +03:00
74345b1c3c Web: Files: ContextOptionsStore fixed onClickLinkEdit, fixed imports 2022-03-03 12:37:54 +03:00
ba2fc9fe88 Merge branch 'develop' into refactoring/refactoring-context-menu 2022-03-03 12:33:42 +03:00
54cecbd5b3 Web: Files: fixed ContextOptionsStore errors 2022-03-03 12:29:48 +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
85a25615aa
Merge pull request #572 from ONLYOFFICE/feature/file-rendering-optimizations
Feature/file rendering optimizations
2022-03-02 18:13:28 +03:00
438584886c
Merge branch 'develop' into feature/file-rendering-optimizations 2022-03-02 17:49:23 +03:00
1ce9b25093 Web: Campaigns: Added more locales 2022-03-02 17:43:10 +03:00
649163e8f7
Merge branch 'develop' into feature/file-rendering-optimizations 2022-03-02 15:25:48 +03:00
2cc05247db Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function 2022-03-02 15:15:03 +03:00
298d4813eb
Merge pull request #512 from ONLYOFFICE/feature/submenu
Feature/submenu
2022-03-02 12:07:45 +03:00
a7a87cdd51 Config: Restored kafka config 2022-03-02 12:02:33 +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
61a127413c delete svc projects 2022-03-01 15:54:23 +03:00
34fc3e545d rename winsw services and delete socket.io.bat 2022-03-01 15:46:31 +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
2719149f3d People: used imlicit usings 2022-03-01 14:58:37 +03:00
b21891ef78 People: logic transferred to engines 2022-03-01 14:52:52 +03:00
mushka
16e83aedac added auto focus offset 2022-03-01 14:45:14 +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