Commit Graph

17775 Commits

Author SHA1 Message Date
aaf50bdc85 Web: BackupStore: Fixed backup progress. 2022-03-09 11:54:14 +03:00
c0b0a26faa Web: Backup: Moved common third-party list to the story. 2022-03-09 11:08:58 +03:00
7130cd884a Web: Fixed translation for max copies. 2022-03-09 10:42:38 +03:00
17743d3e9b Web: Files: Added translation for fr, de, it, zh-CH languages translation. 2022-03-09 10:39:38 +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
4b27512ef8
Merge pull request #575 from ONLYOFFICE/refactoring/refactoring-context-menu
Refactoring/refactoring context menu
2022-03-05 17:42:50 +03:00
e58d3324f2 Files: renamed api parameters 2022-03-05 17:41:47 +03:00
1a9ced4901 Web: Files: fixed context menu opening 2022-03-05 17:36:04 +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
3b9a099996
Merge branch 'develop' into refactoring/refactoring-context-menu 2022-03-05 15:47:14 +03:00
1b5d5882a7
Merge pull request #578 from ONLYOFFICE/feature/slider-redesign
Feature/slider redesign
2022-03-05 15:45:57 +03:00
b43220100f Web: BackupStore: Fixed period label. 2022-03-05 14:53:14 +03:00
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