|
50a882a2b4
|
merge
|
2022-03-28 12:54:01 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
32186f21e7
|
ResponseStream: fix
|
2022-03-28 11:57:18 +03:00 |
|
|
9264302ec4
|
Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue
|
2022-03-28 11:38:50 +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 |
|
|
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 |
|
|
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 |
|
|
cee4ca3a4e
|
Files: fix recent
|
2022-03-23 14:53:49 +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 |
|
|
65b6bf9141
|
removed base extenshion
|
2022-03-22 13:48:50 +03:00 |
|
|
ee8b6eafc1
|
Web: Files: deleted useless folders after merge.
|
2022-03-22 13:22:51 +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 |
|
|
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 |
|
|
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 |
|
|
51315f68ba
|
WEb: Components: HelpButton: Added tooltipMaxWidth prop.
|
2022-03-21 17:26:55 +03:00 |
|
|
010697ec97
|
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix
Bugfix/refactoring fix
|
2022-03-21 17:54:54 +04:00 |
|
|
3e4e1bf0b0
|
Merge pull request #588 from ONLYOFFICE/feature/license-refactor
Feature/license refactor
|
2022-03-21 17:51:42 +04:00 |
|
|
6e4761b8c2
|
Systemd package moved to shared ASC.Api.Core
|
2022-03-21 16:40:09 +03:00 |
|
|
d3d3d4d7ff
|
fix
|
2022-03-21 16:16:55 +03:00 |
|
|
a3f85f8e0b
|
Merge branch 'feature/backend-refactor' into feature/update-packages
|
2022-03-21 14:44:30 +03:00 |
|
|
6215091502
|
Web: Added red border when file is not selected and restore button clicked.
|
2022-03-21 13:53:59 +03:00 |
|
|
26272fc2a5
|
Web: Separated BackupTypes constant.
|
2022-03-21 12:06:10 +03:00 |
|
|
a72106dfae
|
Web: Files: Deleted useless file after merge.
|
2022-03-21 11:55:38 +03:00 |
|
|
5420ceff44
|
Web: Deleted useless files.
|
2022-03-21 11:52:26 +03:00 |
|
|
8a7641798b
|
Web: Backup: Added organization name from settings.
|
2022-03-21 11:15:51 +03:00 |
|
|
73033f996d
|
Web: Files: Added missing translation.
|
2022-03-21 10:49:32 +03:00 |
|