Commit Graph

8400 Commits

Author SHA1 Message Date
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
8a7641798b Web: Backup: Added organization name from settings. 2022-03-21 11:15:51 +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
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
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
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
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
88e2f01913 merge from feature/backend-refactor 2022-03-18 11:12:16 +03:00
645607aae5 default IOptionsMonitor<ILog> => ILog 2022-03-18 11:04:29 +03:00
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
6b3f9a71ad IDE0065 2022-03-17 18:23:19 +03:00
11004ab61c IDE0161 2022-03-17 18:13:38 +03:00
6a09cf47e9 IDE0044 2022-03-17 18:07:17 +03:00
80eb1c8257 IDE0011 2022-03-17 18:01:39 +03:00
69950c9d8c IDE0007 2022-03-17 17:55:19 +03:00
717456d71d CA1805 2022-03-17 17:33:16 +03:00
2ede5d8df7 HealthChecksUI: updated packages 2022-03-16 15:12:15 +03:00
58e1ec015b WebCore: updated packages 2022-03-16 15:09:49 +03:00
b637ccc76a WEb: RestoreBackup: Added loader for restore button. 2022-03-16 12:05:17 +03:00
1f7f9e0aa6 Web: Backup: Added translations (en). 2022-03-16 10:05:29 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
6af313db1d WebApi: refactor 2022-03-15 18:48:29 +03:00
0c61081921 Merge branch 'feature/backend-refactor' into feature/builder-extension 2022-03-15 18:33:58 +03:00
2d2182d171 Web: RestoreStorage: Deleted unused code. 2022-03-15 16:36:37 +03:00
07bacab25d fix merge: ThrowIfNull 2022-03-15 14:12:29 +03:00
5dd68fee6c automapper instead of ToSmtpSettings 2022-03-15 14:11:19 +03:00
82daaf4029 rename model to inDto 2022-03-15 13:56:22 +03:00
39bca9a805 Web: RestoreBackup: Fixed page crash. 2022-03-15 13:47:55 +03:00
82aac7c696 rename dtos 2022-03-15 13:00:41 +03:00
0019a8fd3e Merge branch 'feature/backend-refactor' into feature/web.api-refactoring 2022-03-15 12:51:15 +03:00
de81329df2 WEb: Backup: Added help button component. 2022-03-15 12:43:02 +03:00
969f62a99c Web: PreparationPortal: Removed settings request. 2022-03-15 10:05:05 +03:00
8cbc15a15d Web: Backup: Fixed language for weekdays and for help url. 2022-03-15 09:09:22 +03:00
bce9e824c8 Web: Deleted useless code. 2022-03-15 08:13:23 +03:00
4b32423c3c Web: Backup: MobileView: Added showing and hiding of section header. 2022-03-11 16:49:22 +03:00
36959d8eec Web: Backup: Fixed styles for backup. 2022-03-11 16:40:00 +03:00
934b9824d4 Web: Changed translation according layouts. 2022-03-11 16:07:05 +03:00
32f4b30e3e WEb: AutoBackup: Refactoring, deleted useless code. 2022-03-11 15:55:43 +03:00
0533670187 Web: RestoreBackup: Deleted useless code, refactoring. 2022-03-11 15:38:32 +03:00
12174c73b1 Web: ManualBackup: Refactoring, deleted useless code. 2022-03-11 15:23:48 +03:00
ef2e13007e Web: Backup: Adding storage information from the store. 2022-03-11 15:04:42 +03:00
95742e0ad6 Web: Backup: changed routing for mobile view. 2022-03-11 11:37:54 +03:00
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
ed4cb3ab74 Web: Arrangement of translations alphabetically. 2022-03-10 18:35:16 +03:00
ed9ea31b73 Web: Backup: Deleted useless translations. 2022-03-10 17:52:57 +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
b9719755be Added ThrowIfNull 2022-03-09 20:15:51 +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
e38ac6393b Web: RestoreProgress: Fixed storage. 2022-03-09 15:42:22 +03:00
2aa0a97f98 Web: AutoBackup/ManualBackup: Deleted useless code. 2022-03-09 12:10:36 +03:00
2585c22b3b merge from feature/backend-refactor 2022-03-09 12:10:30 +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
78fafb08ab Microsoft.NET.Sdk.Worker 2022-03-05 18:38:42 +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
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
1fce535cfb WEb: Backup: Added constants. 2022-03-04 17:00:04 +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
960c6f5449 Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
#	web/ASC.Web.Api/Startup.cs
2022-03-03 14:53:23 +03:00
418ca246c8 Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
#	products/ASC.People/Server/Startup.cs
2022-03-03 14:35:22 +03:00
a27734ed97 Web: Added new translations. 2022-03-03 14:06:06 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
85e8ceede5 Web: Added new translations for help information. 2022-03-02 18:54:39 +03:00
1ce9b25093 Web: Campaigns: Added more locales 2022-03-02 17:43:10 +03:00
6fe7eb39cf Web: Deleted close button from dialog. 2022-03-02 16:33:02 +03:00
53eef1101b WEb: PreparationPortal: Deleted useless code. 2022-03-02 16:26:18 +03:00
d565fffc07 Web: Added preparation portal dialog. 2022-03-02 16:19:34 +03:00
f57cff1dcc Merge branch 'develop' into feature/backup 2022-03-02 11:21:57 +03:00
4b59e111af Web: PreparationPortal: Added progress initiation when restore portal. 2022-03-02 11:12:59 +03:00
4805ea2178 Api: fix warnings 2022-03-02 11:08:59 +03:00
609427bf20 merge from feature/backend-refactor 2022-03-01 15:57:49 +03:00
b48bd37ea6 Merge branch 'feature/backend-refactor' into feature/people-refactor 2022-03-01 15:27:07 +03:00
cfbfe84d11 ImplicitUsings 2022-03-01 14:44:13 +03:00
e2c86852a0 remove whitespace 2022-03-01 14:35:29 +03:00
e18d6b8757 refactoring: asc.web.api 2022-03-01 13:58:02 +03:00
e7259608d1 rename dto 2022-03-01 13:03:56 +03:00
0ff56392f8 rename and replace models 2022-03-01 13:03:56 +03:00
c3742208cc replace controllers 2022-03-01 13:03:25 +03:00
fd51115811 Web: ManualBackup: Fixed progress for desktop view. 2022-03-01 09:05:19 +03:00
8474cb8d37 refactor 2022-02-28 23:25:25 +03:00