Commit Graph

17755 Commits

Author SHA1 Message Date
0c9713c65b Web: Moved translations to Common file (sk). 2022-03-10 16:31:02 +03:00
bff2518bf9 Web: Moved translations to Common file (sl). 2022-03-10 16:28:38 +03:00
500945a6da Web: Moved translations to Common file (tr). 2022-03-10 16:26:11 +03:00
e663d59aeb Web: Moved translations to Common file (vi). 2022-03-10 16:25:27 +03:00
297394f359 Web: Moved translations to Common file (uk). 2022-03-10 16:24:18 +03:00
8080e416df Web: Moved translations to Common file (zh-CN). 2022-03-10 16:23:06 +03:00
7bca87c34d Web: Moved translations to the Common (ru). 2022-03-10 16:21:24 +03:00
d63c7cd888 Common: removed using 2022-03-10 14:19:53 +03:00
ad68b7dc60 Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 14:15:49 +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
26066ccb7f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 12:19:18 +03:00
64dfd61858 Merge branch 'develop' into feature/backup 2022-03-10 12:15:26 +03:00
a43c41b251 Web: Added translation for Data Management on en, ru. 2022-03-10 11:21:24 +03:00
c95d3e910d Web: Arrangement of translations alphabetically. 2022-03-10 10:22:26 +03:00
ae267b9e18 WEb: Separated translations. 2022-03-10 09:24:03 +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
061a2f7365 Files: added mapping 2022-03-09 18:12:23 +03:00
37f42e57c4 Web: RestoreBackup: Deleted useless code. 2022-03-09 17:53:39 +03:00
eafb96796b Web: RestoreBackup: Added socketHelper to the backup list dialog. 2022-03-09 17:49:23 +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
e38ac6393b Web: RestoreProgress: Fixed storage. 2022-03-09 15:42:22 +03:00
13ff29413d FIles: added mapping 2022-03-09 15:07:57 +03:00
0f3ce16f85 create new winsw.exe
fix logs
2022-03-09 14:34:28 +03:00
6dc335f10b Files: added file mapping 2022-03-09 12:18:33 +03:00
2aa0a97f98 Web: AutoBackup/ManualBackup: Deleted useless code. 2022-03-09 12:10:36 +03:00
ce4f4cb9b6 Web: AutoBackup: Renaming. 2022-03-09 12:04:45 +03:00
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