Commit Graph

17808 Commits

Author SHA1 Message Date
c7712fd7dc Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-24 18:01:09 +03:00
205bca54ea add rule begin_without_underscore for public fileds 2022-03-24 17:46:56 +03:00
1ee814a2ef Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	products/ASC.Files/Server/GlobalUsings.cs
2022-03-24 17:11:33 +03:00
9fbb192fd3 Test: fix packages 2022-03-24 17:00:02 +03:00
194036454e
Merge pull request #586 from ONLYOFFICE/feature/builder-extension
Feature/builder extension
2022-03-24 17:40:10 +04:00
959cac6243 added missed service 2022-03-24 16:00:28 +03:00
b8380c1353 refactoring 2022-03-24 14:57:39 +03:00
e61a45436d
Merge pull request #585 from ONLYOFFICE/feature/backup
Feature/backup
2022-03-24 13:49:51 +03:00
73928303cf Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-03-24 13:26:28 +03:00
2bd421994e Web: Fixed import. 2022-03-24 13:26:20 +03:00
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
c85f5385f9 Api.Core: added hostbuilder extension method 2022-03-23 19:23:12 +03:00
9c5844fb0d Api.Core: removed unnecessary 2022-03-23 19:22:44 +03:00
49d3094dca Api.Core: removed unnecessary 2022-03-23 19:22:25 +03:00
a13d1ccf3b Merge branch 'develop' into feature/backup 2022-03-23 18:12:01 +03:00
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
85eca545b6 Api.Core: added builder methods 2022-03-23 16:07:26 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
cee4ca3a4e Files: fix recent 2022-03-23 14:53:49 +03:00
0c72f8bcb3 AmiPublicDnsSyncService, StorageSettings: remove IServiceProvider 2022-03-23 14:28:52 +03:00
22c6c1d156 Api: remove service locator 2022-03-22 18:44:10 +03:00
64cd23a7bf Files: fix download as 2022-03-22 16:54:54 +03:00
202338d1f2 fix 2022-03-22 15:59:12 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
f4c75f91f4 refactor 2022-03-22 15:46:13 +03:00
4e78af53f9 refactoring DistributedTaskQueue 2022-03-22 15:10:05 +03:00
65b6bf9141 removed base extenshion 2022-03-22 13:48:50 +03:00
bca173a91c Files: added license header 2022-03-22 13:36:38 +03:00
2be8ecfb22 Files: added license header 2022-03-22 13:34:46 +03:00
e9928c9814 refactor 2022-03-22 13:31:41 +03:00
ee8b6eafc1 Web: Files: deleted useless folders after merge. 2022-03-22 13:22:51 +03:00
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
251f149eb6 Web: Revert withoutBodyScroll after merge. 2022-03-22 13:19:35 +03:00
2559bec9e9 Web: RestoreBackup: Fixed offsetLeft of help button component. 2022-03-22 12:57:17 +03:00
bbc0d20321 Web: Backup: Changed translation. 2022-03-22 12:40:57 +03:00
5b6251f5e7 WEb: Backup: Deleted useless code. 2022-03-22 12:37:51 +03:00
21a2e75ae6 Web: RestoreBackup: Added toastr when file wasn't selected and restore button was clicked. 2022-03-22 12:36:00 +03:00
fd4320d147 Web: RestoreBackup: Added user agreement on restore to the dialog. 2022-03-22 12:27:27 +03:00
82c96d160f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-22 12:09:41 +03:00
9bea7b362b Merge branch 'develop' into feature/backup 2022-03-22 09:59:55 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
2022-03-21 22:24:11 +04:00
b4c44d1b09 Merge branch 'feature/backend-refactor' into feature/files-controller-refactor 2022-03-21 19:03:57 +03:00
cf8c1ba3ff Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-21 18:52:09 +03:00
ae490c3290 System.Linq.Async package moved to share ASC.Core.Common 2022-03-21 18:32:04 +03:00
a6f111463b refactor 2022-03-21 18:11:26 +03:00
7f81a77556 Redis.Newtonsoft, Redis.AspNetCore moved to shared ASC.Api.Core 2022-03-21 17:53:23 +03:00
e9671701cb Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core 2022-03-21 17:39:01 +03:00
a4deb55535 Web: AutoBackup: Added clarification on the time. 2022-03-21 17:32:46 +03:00