|
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 |
|
|
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 |
|
|
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 |
|
|
f54b0d0f25
|
Web: files: Deleted useless code.
|
2022-03-21 10:45:55 +03:00 |
|
|
4e4bea4d02
|
Web: Components: Deleted useless classname.
|
2022-03-21 10:44:52 +03:00 |
|
|
5bcc792132
|
Merge branch 'feature/license-refactor' of github.com:ONLYOFFICE/AppServer into feature/license-refactor
|
2022-03-21 10:37:02 +03:00 |
|
|
da31770f18
|
added deleted license headers
|
2022-03-21 10:36:07 +03:00 |
|
|
3f957337b8
|
WEb: Common: Deleted useless code.
|
2022-03-21 10:14:26 +03:00 |
|
|
eec0545987
|
fixed build.
|
2022-03-20 18:24:26 +03:00 |
|
|
679aecbc76
|
Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
|
2022-03-20 16:47:31 +03:00 |
|
|
07c618b23d
|
update packages
|
2022-03-20 16:44:49 +03:00 |
|
|
868492b562
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2022-03-19 22:16:03 +03:00 |
|
|
61f4f33990
|
fixed DistributedTask
|
2022-03-19 18:48:51 +03:00 |
|
|
1c74b5702b
|
Files:fix notify
|
2022-03-19 18:05:26 +03:00 |
|
|
21a8c0e0fc
|
removed httpclient ctor
|
2022-03-18 22:34:01 +03:00 |
|
|
37e0a4715c
|
fix tests
|
2022-03-18 18:44:00 +03:00 |
|
|
9ca8191ddd
|
Web: ManualBackup: Added import.
|
2022-03-18 15:58:30 +03:00 |
|
|
4a959f3667
|
Web: Backup: Fixed a bug of false disable of third-party resources.
|
2022-03-18 15:52:25 +03:00 |
|
|
786fdb761d
|
Web: PreparationPortal: Renamed file.
|
2022-03-18 15:35:58 +03:00 |
|
|
e99b63c443
|
Web: PreparationPortal: Fixed position of image on mobile.
|
2022-03-18 15:34:13 +03:00 |
|
|
c61df3290c
|
Web: AutoBackup: Fixed dropdown height for time and count of copies.
|
2022-03-18 15:18:14 +03:00 |
|
|
c22bc6d809
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2022-03-18 15:08:28 +03:00 |
|
|
a53456691d
|
Web: Backup: Fixed double of toastr when create backup.
|
2022-03-18 15:08:17 +03:00 |
|
|
d207bcee3a
|
added missing method
|
2022-03-18 13:38:40 +03:00 |
|