Commit Graph

17757 Commits

Author SHA1 Message Date
ef2d2e5a1c Web: Backup: Moved backup progress to the store, refactoring. 2022-03-05 14:30:07 +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
11708952e9 Web: People: fixed context-menu 2022-03-05 10:48:27 +03:00
fb83a54871 Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService 2022-03-05 10:44:39 +03:00
77144d6f3c added mapping 2022-03-05 10:28:50 +03:00
b6be156a75 Common: fix 2022-03-05 10:27:52 +03:00
291052112d Web: People: fixed TableRow 2022-03-05 10:22:53 +03:00
4a61f9fce5 VoipService: refactor mapping 2022-03-04 19:35:12 +03:00
1fce535cfb WEb: Backup: Added constants. 2022-03-04 17:00:04 +03:00
9c9534038f Merge branch 'develop' into feature/slider-redesign 2022-03-04 18:57:51 +05:00
47358b007e Web: Components: added style prop 2022-03-04 18:56:57 +05:00
7bfcc8b249 Web: Components: create slider component 2022-03-04 18:54:57 +05:00
250eeaaa60 Web: Components: fixed slider margin 2022-03-04 18:54:14 +05:00
ba29c3aee0 Web: Components: moved slider to components 2022-03-04 18:53:41 +05:00
ea8e68c950 add ssoAuth.bat with yarn install 2022-03-04 16:50:12 +03:00
da73ff523c Files: resolve names for mapping, add mapping 2022-03-04 16:40:28 +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
d6fe627217 Web: AutoBackup: Refactoring. 2022-03-04 16:12:06 +03:00
10e8ab7a12 Web: Backup: Moved auto backup information to the store. 2022-03-04 15:55:04 +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
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
a27734ed97 Web: Added new translations. 2022-03-03 14:06:06 +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
85e8ceede5 Web: Added new translations for help information. 2022-03-02 18:54:39 +03:00