Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit e61a45436d558324d6ae5b37c695da82001fc44e
Merge: cee4ca3a4e 73928303cf
Author: Alexey Safronov <[email protected]>
Date:   Thu Mar 24 13:49:51 2022 +0300

    Merge pull request #585 from ONLYOFFICE/feature/backup

    Feature/backup

commit 73928303cf9259ea1211c829f15ce82f331113bb
Merge: 2bd421994e a13d1ccf3b
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 24 13:26:28 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit 2bd421994e77d840e11f67fab22552b9a66d390c
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 24 13:26:20 2022 +0300

    Web: Fixed import.

commit a13d1ccf3bf0478477cda6faf2172a2c6266a9c1
Merge: ee8b6eafc1 cee4ca3a4e
Author: Alexey Safronov <[email protected]>
Date:   Wed Mar 23 18:12:01 2022 +0300

    Merge branch 'develop' into feature/backup

commit cee4ca3a4e68b24391074a28f00685cfd0159bd9
Author: pavelbannov <[email protected]>
Date:   Wed Mar 23 14:53:49 2022 +0300

    Files: fix recent

commit 64cd23a7bf8b5eb37b628527858c404e09263d97
Author: pavelbannov <[email protected]>
Date:   Tue Mar 22 16:54:54 2022 +0300

    Files: fix download as

commit ee8b6eafc113b371852bfca4c12b5abf44942abb
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 13:22:51 2022 +0300

    Web: Files: deleted useless folders after merge.

commit 251f149eb6d09b96f3e218e099f97115cdd723e2
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 13:19:35 2022 +0300

    Web: Revert withoutBodyScroll after merge.

commit 2559bec9e99f662424bfca0e64e5839d468bfcd6
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 12:57:17 2022 +0300

    Web: RestoreBackup: Fixed offsetLeft of help button component.

commit bbc0d20321da758449c92bbf85888247e5d0e1f1
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 12:40:57 2022 +0300

    Web: Backup: Changed translation.

commit 5b6251f5e74d0cdeab0dd8093fdc4108a70bac7a
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 12:37:51 2022 +0300

    WEb: Backup: Deleted useless code.

commit 21a2e75ae616dde46b44dbeca910f8dc215917f9
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 12:36:00 2022 +0300

    Web: RestoreBackup: Added toastr when file wasn't selected and restore button was clicked.

commit fd4320d147d8a5982abe7987be6e4ef087ac51f9
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 12:27:27 2022 +0300

    Web: RestoreBackup: Added user agreement on restore to the dialog.

commit 9bea7b362bdc08cdf941139e66b78d029d664833
Merge: a4deb55535 61f4f33990
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 22 09:59:55 2022 +0300

    Merge branch 'develop' into feature/backup

commit a4deb555356029d7f444f482f0141f39be753679
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 17:32:46 2022 +0300

    Web: AutoBackup: Added clarification on the time.

commit 51315f68ba7c8f3f9f2feb5ce0a91c3349ceac07
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 17:26:55 2022 +0300

    WEb: Components: HelpButton: Added tooltipMaxWidth prop.

commit 6215091502727bc20527ec4f698229529c6c7473
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 13:53:59 2022 +0300

    Web: Added red border when file is not selected and restore button clicked.

commit 26272fc2a5af993465e40f48e0c7f6fe92afe248
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 12:06:10 2022 +0300

    Web: Separated BackupTypes constant.

commit a72106dfae8e44f03ce8a8c11093ce3d22f235e3
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 11:55:38 2022 +0300

    Web: Files: Deleted useless file after merge.

commit 5420ceff44fcbb115d274d57e6bfce09a6a2d7c8
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 11:52:26 2022 +0300

    Web: Deleted useless files.

commit 8a7641798bb49c57b810c580b5022a42f0cc2be1
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 11:15:51 2022 +0300

    Web: Backup: Added organization name from settings.

commit 73033f996d8f440c50fa10b0c9911bcc5a2e58ca
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 10:49:32 2022 +0300

    Web: Files: Added missing translation.

commit f54b0d0f258d00f896eb41ee99f4d1dfef5174e8
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 10:45:55 2022 +0300

    Web: files: Deleted useless code.

commit 4e4bea4d02299acb140ffe708be195dd7cd78ee9
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 10:44:52 2022 +0300

    Web: Components: Deleted useless classname.

commit 3f957337b8874781ad22c3ecc84143423e6c4285
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Mar 21 10:14:26 2022 +0300

    WEb: Common: Deleted useless code.

commit 61f4f339907699f5b682d9ecd0422eac94d25e01
Author: pavelbannov <[email protected]>
Date:   Sat Mar 19 18:48:51 2022 +0300

    fixed DistributedTask

commit 1c74b5702bf99c00cd0a641f5b87738773a01f18
Author: pavelbannov <[email protected]>
Date:   Sat Mar 19 18:05:26 2022 +0300

    Files:fix notify

commit 21a8c0e0fccd6934484cf43dcff5046f1d8fc8c1
Author: pavelbannov <[email protected]>
Date:   Fri Mar 18 22:34:01 2022 +0300

    removed httpclient ctor

commit 9ca8191ddd0eb8c13df29e084173e5e58ce3ed17
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:58:30 2022 +0300

    Web: ManualBackup: Added import.

commit 4a959f36674f508b0f589c7113cc1b8501e453aa
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:52:25 2022 +0300

    Web: Backup: Fixed a bug of false disable of third-party resources.

commit 786fdb761d44549457c7370036103f27a85db4f4
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:35:58 2022 +0300

    Web: PreparationPortal: Renamed file.

commit e99b63c443744a21ea4811a6f66ac590ea0960ad
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:34:13 2022 +0300

    Web: PreparationPortal: Fixed position of image on mobile.

commit c61df3290ca8254a6677943c75516526c00c58a8
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:18:14 2022 +0300

    Web: AutoBackup: Fixed dropdown height for time and count of copies.

commit c22bc6d8096d85a3f460851514b8645b57dbf693
Merge: a53456691d 38d685c4ce
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:08:28 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit a53456691d6224cc0b13b756f9a6e30db8b90b3d
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 18 15:08:17 2022 +0300

    Web: Backup: Fixed double of toastr when create backup.

commit 38d685c4ceca3b3399d03177f7c0a9e2cb2da77a
Merge: cbbe1dd12b fe9962167e
Author: Alexey Safronov <[email protected]>
Date:   Thu Mar 17 11:03:09 2022 +0300

    Merge branch 'develop' into feature/backup

commit fe9962167e8ff68d1e6e85a5051b694e681ddf55
Author: pavelbannov <[email protected]>
Date:   Wed Mar 16 17:19:34 2022 +0300

    CRM: fix build

commit cbbe1dd12ba514f58a64150a83d65f28e81529ed
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 16 12:17:04 2022 +0300

    Web: Components: Fixed file icon going beyond input. (for iOS, macOS)

commit b637ccc76a481d1cdc707dcb221e54064432d2ee
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 16 12:05:17 2022 +0300

    WEb: RestoreBackup: Added loader for restore button.

commit 1f7f9e0aa6cca94e32991778f67281c65876d39a
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 16 10:05:29 2022 +0300

    Web: Backup: Added translations (en).

commit 72390a09dac97efa374076e8609121c658e50624
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 18:04:00 2022 +0300

    Web: Common: Fixed help url.

commit 2d2182d17196ec234f7aca28c1148319721c6e02
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 16:36:37 2022 +0300

    Web: RestoreStorage: Deleted unused code.

commit 39bca9a8056d1462a1efda1b9af89cc51b30ef34
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 13:47:55 2022 +0300

    Web: RestoreBackup: Fixed page crash.

commit de81329df28c26c309da208df5974178604284a4
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 12:43:02 2022 +0300

    WEb: Backup: Added help button component.

commit 209d7bd7505054983b385f17a1772668cad6a96d
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 12:29:09 2022 +0300

    Web: Files: Deleted unused code.

commit a61ba5697c45917dc8e813622f9ef0c2aa2c7d50
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 12:14:41 2022 +0300

    Web: Common: Added constants.

commit 1d6281b4ddf41bc914eb27013f33f298cce0c8d2
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 11:26:37 2022 +0300

    Web: Common: Deleted useless code.

commit 969f62a99c715055470c0e943ecdbd2fdd2f59f8
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 10:05:05 2022 +0300

    Web: PreparationPortal: Removed settings request.

commit 8cbc15a15d0fe8a121db9c12d2c0d272bcf5e1e6
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 09:09:22 2022 +0300

    Web: Backup: Fixed language for weekdays and for help url.

commit 08dccaddf81527d2076e56382348586aef6aec20
Merge: bce9e824c8 43af2f68c3
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 08:13:29 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit bce9e824c84f4a2fadce13626ac300b79cb4bb90
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 15 08:13:23 2022 +0300

    Web: Deleted useless code.

commit 5c820fdcd52503e27aa9d1ac053796b741814002
Author: pavelbannov <[email protected]>
Date:   Mon Mar 14 21:47:34 2022 +0300

    Index: create index only in service

commit 43af2f68c36e911e8dd425fbbab444764d4de1f3
Author: SuhorukovAnton <[email protected]>
Date:   Mon Mar 14 17:59:00 2022 +0300

    implement InitiateChunkedUploadAsync in discDataStore

commit cb678366846cc8a541e7aaba8da654529ab39028
Author: SuhorukovAnton <[email protected]>
Date:   Mon Mar 14 14:48:56 2022 +0300

    backup: fix restore from third-party storage

commit 4b32423c3c61b3603e247485ff317bd7791fcb59
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 16:49:22 2022 +0300

    Web: Backup: MobileView: Added showing and hiding of section header.

commit 36959d8eecf40a57d44d27c06f79f470d11c702d
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 16:40:00 2022 +0300

    Web: Backup: Fixed styles for backup.

commit 934b9824d471fa840b2b694611591c35b816ed9b
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 16:07:05 2022 +0300

    Web: Changed translation according layouts.

commit 32f4b30e3ea282d3a9656ea4cf931ca3eb8f0419
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 15:55:43 2022 +0300

    WEb: AutoBackup: Refactoring, deleted useless code.

commit 05336701876c1d8ef26db6635c55cd6b17189107
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 15:38:32 2022 +0300

    Web: RestoreBackup: Deleted useless code, refactoring.

commit 12174c73b1608e23465b13301d25c29f2033e588
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 15:23:48 2022 +0300

    Web: ManualBackup: Refactoring, deleted useless code.

commit ef2e13007e0a6d59d2aa237082d715224c3ad314
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 15:04:42 2022 +0300

    Web: Backup: Adding storage information from the store.

commit 95742e0ad6f59ee6928af48b8c71c4606ac390e3
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 11 11:37:54 2022 +0300

    Web: Backup: changed routing for mobile view.

commit ed4cb3ab74a7412c023213945e0517cea58ae4d6
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 18:35:16 2022 +0300

    Web: Arrangement of translations alphabetically.

commit ed9ea31b7305e89069c3c168defabfe7bdf319a6
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:52:57 2022 +0300

    Web: Backup: Deleted useless translations.

commit dc273d4a216e08bd010f16069012838cf247152d
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:52:26 2022 +0300

    Web: Files: Changed translations keys.

commit d793b099ff3e7a7af39769e1831620a3dfda1254
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:45:13 2022 +0300

    WEb: Files: Changed translation keys.

commit afb0510fd622d58bbaf870da36001861645bb4bb
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:30:30 2022 +0300

    Web: Moved translations to Common file (az).

commit 1cb034548387a3048d038a8f0c73d521f20f767f
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:26:47 2022 +0300

    Web: Moved translations to Common file (bg).

commit ca45ca77d7566c1960ed41ec6783d968d930afec
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:25:20 2022 +0300

    Web: Moved translations to Common file (cs).

commit 685e7e01931237a34ee4f2039e2f2c518f5a105c
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:18:26 2022 +0300

    Web: Moved translations to Common file (de).

commit 9a4715fad767591215bc8a514c1642a8d1336b23
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 17:10:09 2022 +0300

    Web: Moved translations to Common file (el).

commit 5d4a54e1ce1548b3b6a9325ca7a88aeb606b7400
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:57:56 2022 +0300

    Web: Moved translations to Common file (en).

commit a403bdbf03bb4a5e7dcdc9e8bbf48cbdcddfa861
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:56:15 2022 +0300

    Web: Moved translations to Common file (es).

commit 7b5f653ead22e61039b7f2d184c17ba87c00ad39
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:54:21 2022 +0300

    Web: Moved translations to Common file (fi).

commit a94be67b16571b08446e59b77df3fcec1b85d1c5
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:52:35 2022 +0300

    Web: Moved translations to Common file (fr).

commit 84f1a05ba3592142dbc591424bb2a22ffe2e65c5
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:50:04 2022 +0300

    Web: Moved translations to Common file (it).

commit 9467226e090a6f9cee6ef9d8516a9ad70362c526
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:48:45 2022 +0300

    Web: Moved translations to Common file (ja).

commit 05da08892dae9f8518299f17ad15153db20d939f
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:47:13 2022 +0300

    Web: Moved translations to Common file (ko).

commit e15108a62cd67054e0de18b11cbd3d06f6ec8858
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:45:08 2022 +0300

    Web: Moved translations to Common file (lo).

commit 0efd8d1126f41821e76da01fd1c836fb5431751e
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:43:34 2022 +0300

    Web: Moved translations to Common file (lv).

commit d2e1f04d8a4337af586acd93f555ed639f369cbe
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:41:37 2022 +0300

    Web: Moved translations to Common file (nl).

commit 56b4eece3d80f77fbc8e228a4c8e771992995317
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:39:54 2022 +0300

    Web: Moved translations to Common file (pl).

commit 4eae2cdb3c8394da519b3dabcd3b2f7e7b388362
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:38:25 2022 +0300

    Web: Moved translations to Common file (pt).

commit 34e1f835fe135ea94fa4b2518c2fbd3db7c4828e
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:36:25 2022 +0300

    Web: Moved translations to Common file (pt-BR).

commit 8ba131d52ddefcce5da2133f4f707bbdb1c2a746
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:33:31 2022 +0300

    Web: Moved translations to Common file (ro).

commit 0c9713c65b919a4d298b5176c20a7fbbbaa59829
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:31:02 2022 +0300

    Web: Moved translations to Common file (sk).

commit bff2518bf98ecc8113e4e8d8e0c6841e263635e6
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:28:38 2022 +0300

    Web: Moved translations to Common file (sl).

commit 500945a6dafedb1f891703efd2c8a4d6c096404e
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:26:11 2022 +0300

    Web: Moved translations to Common file (tr).

commit e663d59aebe7e4382ec8a43c893843de0add70ef
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:25:27 2022 +0300

    Web: Moved translations to Common file (vi).

commit 297394f359cdf5e6052b870733a2f600fcf550e7
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:24:18 2022 +0300

    Web: Moved translations to Common file (uk).

commit 8080e416df84d548b1e1e5eff52ae40f2cc70516
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:23:06 2022 +0300

    Web: Moved translations to Common file (zh-CN).

commit 7bca87c34d2fcb154e761661016038499892b7fa
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 16:21:24 2022 +0300

    Web: Moved translations to the Common (ru).

commit 64dfd61858136891695bfdbe8198aea22335323c
Merge: a43c41b251 4b27512ef8
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 12:15:26 2022 +0300

    Merge branch 'develop' into feature/backup

commit a43c41b251ceb6600ce389f9ad12684614efcecc
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 11:21:24 2022 +0300

    Web: Added translation for Data Management on en, ru.

commit c95d3e910dc3ddd69e172dce8dbbb31f1aa8b47b
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 10:22:26 2022 +0300

    Web: Arrangement of translations alphabetically.

commit ae267b9e188028ff81602df710a118391a2f007e
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 10 09:24:03 2022 +0300

    WEb: Separated translations.

commit 37f42e57c4c672de40d364f1e652ea7a2c0b43ee
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 17:53:39 2022 +0300

    Web: RestoreBackup: Deleted useless code.

commit eafb96796b9cd3c75bb6d88907378d86167759a5
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 17:49:23 2022 +0300

    Web: RestoreBackup: Added socketHelper to the backup list dialog.

commit e38ac6393be9d4e2407f8e7e0a3a4be404d7b718
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 15:42:22 2022 +0300

    Web: RestoreProgress: Fixed storage.

commit 2aa0a97f9883ab70a3a5cca89f5ce5ead2fece1b
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 12:10:36 2022 +0300

    Web: AutoBackup/ManualBackup: Deleted useless code.

commit ce4f4cb9b6d77c40264511230e310a8a1f997bfd
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 12:04:45 2022 +0300

    Web: AutoBackup: Renaming.

commit aaf50bdc852eefcc7e5dddad21ab7b671d0b3335
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 11:54:14 2022 +0300

    Web: BackupStore: Fixed backup progress.

commit c0b0a26faa55979a052b087f3350785c4f0d969c
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 11:08:58 2022 +0300

    Web: Backup: Moved common third-party list to the story.

commit 7130cd884acdbe20cc8fb135a5c5fc42855ac732
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 10:42:38 2022 +0300

    Web: Fixed translation for max copies.

commit 17743d3e9b1afdbef7098d546418494eb5d0bd59
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 9 10:39:38 2022 +0300

    Web: Files: Added translation for fr, de, it, zh-CH languages translation.

commit b43220100f19dbf83fbaa05823574d102105f2d9
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Mar 5 14:53:14 2022 +0300

    Web: BackupStore: Fixed period label.

commit ef2d2e5a1c38eb04b1cbe6bdabbfc561a25d1903
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Mar 5 14:30:07 2022 +0300

    Web: Backup: Moved backup progress to the store, refactoring.

commit 1fce535cfbd44234303dc05a23ee62d58059164b
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 4 17:00:04 2022 +0300

    WEb: Backup: Added constants.

commit d6fe627217364f4fc1791add052629601c594e15
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 4 16:12:06 2022 +0300

    Web: AutoBackup: Refactoring.

commit 10e8ab7a12440e0a3dd9f4e06626f098e3a8a1da
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Mar 4 15:55:04 2022 +0300

    Web: Backup: Moved auto backup information to the store.

commit a27734ed9794a4518749acfa55a8579518dcffe3
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Mar 3 14:06:06 2022 +0300

    Web: Added new translations.

commit 85e8ceede5c16aac9da719f271e1b06ad8011d81
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 2 18:54:39 2022 +0300

    Web: Added new translations for help information.

commit 6fe7eb39cf208ecab0607c97173a5fea19b61fa0
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 2 16:33:02 2022 +0300

    Web: Deleted close button from dialog.

commit 53eef1101b7d3f91411157f057fbda620bce3cd9
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 2 16:26:18 2022 +0300

    WEb: PreparationPortal: Deleted useless code.

commit d565fffc078da8697abc61aeee63ecf77975899a
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 2 16:19:34 2022 +0300

    Web: Added preparation portal dialog.

commit f57cff1dccbd40cd91208d8b6fe30f2313783175
Merge: 4b59e111af b7b59072f6
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 2 11:21:57 2022 +0300

    Merge branch 'develop' into feature/backup

commit 4b59e111afdc488618cbbc33a9ba8e7346cb8e1b
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Mar 2 11:12:59 2022 +0300

    Web: PreparationPortal: Added progress initiation when restore portal.

commit fd51115811d9d6ce78382a63a9fa7af04b2d7d0c
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Mar 1 09:05:19 2022 +0300

    Web: ManualBackup: Fixed progress for desktop view.

commit de5af495521449f96846a3e90330f043c96881e5
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 28 18:47:42 2022 +0300

    WEb: AutoBackup: Deleted isDesktop prop;

commit e4deaa19b0c42202dbe81351cfe476da34538dd8
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 28 18:31:11 2022 +0300

    Web: Settings: Added backup store.

commit c2518d3b1e505f9f4f1c7ee3e89cd020a89e6373
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 28 15:08:58 2022 +0300

    Web: AutoBackup: Fixed styles of schedule component for desktop.

commit f576f80fb762804754982c8ccdebe17ed07b34b6
Merge: 9120fc230f 6c8165ecdc
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 28 11:25:07 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit 9120fc230fac8bc65567559c0b98e8188e4a17d1
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 28 11:24:54 2022 +0300

    Web: Renamed translations keys, deleted useless.

commit 6c8165ecdc6550f597d917c0455c11d0942bb0ba
Merge: eae8b7c0bb 93e5cf889c
Author: Alexey Safronov <[email protected]>
Date:   Fri Feb 25 19:08:08 2022 +0300

    Merge branch 'feature/backup' of https://github.com/ONLYOFFICE/AppServer into feature/backup

commit eae8b7c0bb2e58868846454af1ff314fa45b3a05
Author: Alexey Safronov <[email protected]>
Date:   Fri Feb 25 19:08:02 2022 +0300

    Web: Socket: Added "restore-backup" event listeners

commit 93e5cf889c714962bf93ddcbaafc659ee3fee8df
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 17:17:18 2022 +0300

    Web: RestoreBackup: Added error handler for local file.

commit 2bb84187e3c490f40e58f749df35874340f0d8aa
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 17:10:27 2022 +0300

    Web: Backup: Added help information for modules.

commit 0302dfd9ac566f3daa9bbaf1474c9e4c829bc468
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 16:27:17 2022 +0300

    Web: ManualBackup: Fixed temporary link for desktop version.

commit f07aa0a183be11930a78920cf8ee6206dc988750
Merge: d9a8fd58ba c35cfba820
Author: Alexey Safronov <[email protected]>
Date:   Fri Feb 25 16:05:43 2022 +0300

    Merge branch 'develop' into feature/backup

    # Conflicts:
    #	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
    #	config/nginx/onlyoffice.conf
    #	packages/asc-web-common/constants/index.js
    #	products/ASC.Files/Client/src/components/panels/StyledPanels.js
    #	products/ASC.Files/Client/webpack.config.js
    #	web/ASC.Web.Api/Models/SettingsWrapper.cs
    #	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js

commit d9a8fd58ba2ffb70cf41720972c9b432486253f6
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 12:05:43 2022 +0300

    Web: Backup: Added max length to the text.

commit 47faaf1653856146479e6ed4629f60155e381dbe
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 11:54:21 2022 +0300

    Web: Backup: Added description of modules.

commit a5a72e3e9d8dcb7f055f3585105fce31547caa49
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 11:38:07 2022 +0300

    Web: Backup: Changed styles.

commit 56caa47575ed876d9b74e5fc4b12f66593aed080
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 25 10:46:14 2022 +0300

    Web: Backup: Added desktop view.

commit 32d73f902e3162759c00abf2d6038f3c756d12c3
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 24 10:03:24 2022 +0300

    Web: Restore: Rename folder.

commit c0a1f209844e3968b6e13af2040db71008216aba
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 24 09:46:39 2022 +0300

    Web: ManualBackup: Rename folder.

commit ac595bb1e5473def4c0bf6ea67e68b579b9b6693
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 24 09:44:59 2022 +0300

    Web: Auto: Rename folder.

commit dd183de11d7018ebc32b5f077c421b29ed59a49c
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 24 09:35:27 2022 +0300

    Web: Moved files to separate folder.

commit bbb01a96d19446c65ead382fbfa5bf7b305f1201
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 24 09:02:53 2022 +0300

    WEb: Files: Restore: Fixed page fall.

commit 27254146ae1103c42df0e033c8fe170d291d04a5
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 22 15:38:36 2022 +0300

    Web: Files: Restore: Added new loader.

commit b5bcfa03b9533a500269befa4b5a3d9fc89ad3a5
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 22 15:36:52 2022 +0300

    Web: common: Added list loader to the Loaders file.

commit 877783cf71a9fb5e18fc16f642f012223abbd159
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 22 15:35:58 2022 +0300

    Web: Common: Added list loader.

commit 85d6f3541ef388d17ab3ad57d6963f4f47b8e09a
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 22 12:37:16 2022 +0300

    Web: Files: Changed styles for empty backup list.

commit c29d35c36d40b527e8f008cb5e077dca56888165
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 22 12:30:30 2022 +0300

    Web: Files: Added possibility to delete backup elem without selected file.

commit d09776db37323d5f90adafd9d82b34da478cd704
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 21 17:21:50 2022 +0300

    Web: Files: The logic of the dialog with the list of backups has been changed, redesign.

commit 41b5a1dcd18d5ce0a273658afeec62b8c6517619
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 18 10:54:53 2022 +0300

    Web: Files: Hidden elements of NavMenu, disabled click on logo.

commit 4b06ae5f0e03047ac2f281c7122f2cb6b78385f2
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 18 10:01:55 2022 +0300

    Web: Files: Common: Added redirect to preparation portal.

commit f978cb657d247dd03154784426370b5f1bdc1c67
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 16 11:24:12 2022 +0300

    Web: files: AutoBackup: Optimization saving process.

commit b5ebbef616bb342557ebb9d5b8032d677803a23a
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 16 10:11:08 2022 +0300

    Web: files: AutoBackup: Delete useless code.

commit 879a027055df3d83e641e277ff3467853179f16b
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 15 18:22:55 2022 +0300

    Web: Files: AutoBackup: Optimization modules.

commit 853d2280b6328b6847c739da02abad9a1b6169c2
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 15 09:24:44 2022 +0300

    Web: Files: RestoreBackup: Hidden elements of header.

commit 4a6ad133b08411e1d098b06dd645689c536c1e48
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 14 17:46:27 2022 +0300

    Web: files: Changed styles for preparation portal.

commit 6ba390ea62057088a0417458f63a7f26686b7948
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 14 17:06:26 2022 +0300

    Web: Files: AutoBackup: optimization, refactoring.

commit 206ed1a04b6b9bdb8cb6a4db87b485b57cbfb686
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 14 11:52:15 2022 +0300

    Backup: Added request to exception.

commit 70b3231756cdc6ee5bccbd3197a442ea58e23cf0
Merge: 4fbf3177b5 6b8304304f
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 14 10:51:38 2022 +0300

    Merge branch 'develop' into feature/backup

commit 4fbf3177b5e982b7d75813697aa20d8d052b7a9a
Merge: 099d7049e3 e1116276eb
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 10 18:17:43 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit 099d7049e3c1de0b3f07367fcd4e32b61b199b3a
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 10 18:17:34 2022 +0300

    Web: files: Fixed enabling of auto backup/restore.

commit e1116276eb95870b5a025ca0720215151df0866f
Author: SuhorukovAnton <[email protected]>
Date:   Thu Feb 10 14:12:28 2022 +0300

    backup: fix GetTasks

commit 214df42f57c31d7985b81c80a6e771b4f03d542d
Merge: 6ee61695be 73f82b1f2a
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 10 13:16:52 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit 6ee61695be015c0f362cee0c99fa5076ba6227fc
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 10 13:16:46 2022 +0300

    Web: files: added start restore.

commit 73f82b1f2abdeb18aec452cca32e73047c4f0bd7
Author: SuhorukovAnton <[email protected]>
Date:   Thu Feb 10 13:05:36 2022 +0300

    backup: bugfix: link = null

commit 0d083c90afe296eb540684387db77878354c8527
Merge: 920d999052 038178b05b
Author: SuhorukovAnton <[email protected]>
Date:   Thu Feb 10 11:02:35 2022 +0300

    Merge branch 'feature/backup' of https://github.com/ONLYOFFICE/AppServer into feature/backup

commit 920d9990524eb8cb2b76d56ccfbdf34207c7a51b
Author: SuhorukovAnton <[email protected]>
Date:   Thu Feb 10 11:02:28 2022 +0300

    backup: add "completed" in end restore and transfer

commit 1acf512f873cbcdcbd260c49ae5a7aaab8c11c4e
Author: SuhorukovAnton <[email protected]>
Date:   Thu Feb 10 11:01:51 2022 +0300

    backup: add in startup backupFileUpload.ashx

commit 038178b05b17e0c40cb1cab481ac8ba295f1f504
Merge: 0069c6e7d4 6f9d9e4617
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 10 09:03:32 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit 6f9d9e46178b6a16f7a035e11e9f469b73eaad69
Author: SuhorukovAnton <[email protected]>
Date:   Wed Feb 9 18:39:44 2022 +0300

    backup: bugfix

commit 0069c6e7d4d9e257d632ffd69adebaa87604856e
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 9 18:30:36 2022 +0300

    Web: Files: RestoreBackup: Fixed timer.

commit ddd2e7182f1e7920bd48af9dfe20c3c314c72dbb
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 9 18:16:07 2022 +0300

    Web: Files: Backup: Added method to check if automatic backup is available, refactoring.

commit 6510927b20465c7a38c706f74cad7daa43e921e1
Author: SuhorukovAnton <[email protected]>
Date:   Wed Feb 9 17:39:02 2022 +0300

    backup: add api method enableAutoBackup

commit f8a748aae3e221cffa4a2a74686ee733bd36c03d
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 9 17:25:40 2022 +0300

    Web: files: Code simplification.

commit e8c2ce8294c198ebf77cc2702634d3644b401fdb
Merge: a7337f6580 f354775332
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 9 15:29:14 2022 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit a7337f6580c6e93d1fd7660f12d7a17f664200ae
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Feb 9 15:08:48 2022 +0300

    Web: Files: ManualBackup: Optimization, refactoring.

commit f3547753321b90e7af0d7801ac6111b0e81a15d3
Merge: d429bcc731 b6d98a8227
Author: SuhorukovAnton <[email protected]>
Date:   Wed Feb 9 13:42:11 2022 +0300

    Merge branch 'develop' into feature/backup

commit d429bcc7311862e0c1dfffebb060b001e60c43a5
Merge: 0dbf561def b1be9953ad
Author: SuhorukovAnton <[email protected]>
Date:   Wed Feb 9 12:40:16 2022 +0300

    Merge branch 'develop' into feature/backup

commit 783d5bd95e44b5f67e147773e2612dc7295d04dc
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 8 17:53:17 2022 +0300

    Web: files: restoreBackup: Optimization.

commit 0dbf561def1725a01ab4208dcc5a0b9d6f24c3c2
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 8 11:11:08 2022 +0300

    Web: Files: AutoBackup: changed schedule styles.

commit 0c73b7f36621c5ece9368211247e154ac0fc494b
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 8 11:06:53 2022 +0300

    Web: Files: AutoBackup: Changed styles.

commit 7d4069a559a88e320598518c24e28d6400564807
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 8 10:52:00 2022 +0300

    WEb: files: ManualBackup: Changed styles.

commit aac83608a272a1beb7ffdbb5644d3e2f85ac7456
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 8 10:32:51 2022 +0300

    Web: Files: SelectFolderDialog: Added missing prop.

commit d2dfac2ed3b5fe44eea2d97f48df40f8041a2aba
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Feb 8 10:32:20 2022 +0300

    Web: RestoreBackup: Changed styles.

commit 87b0931f545a58322de536e3ceca03b19026c5bb
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 7 17:27:07 2022 +0300

    Web: Files: RestoreBackup: Refactoring.

commit 0f714ebd15a9f08cfa3a65bed4273f989e184663
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 7 16:37:05 2022 +0300

    WEb: Files: RestoreBackup: Added logic for third party storage.

commit fd7528879d942aee3ca57a07f44ec3ad6eb76a33
Author: SuhorukovAnton <[email protected]>
Date:   Mon Feb 7 13:57:00 2022 +0300

    backup: bugfix

commit b47e1f02159dd7bd51a0dc5473f0b7a5d66a93cb
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 7 13:22:19 2022 +0300

    Web: files: Fixed upload method.

commit a3ffeadafe6177f0e8906f1b45ab0510d6acb2dd
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 7 13:02:35 2022 +0300

    Web: Files: Added upload method.

commit 40d56075f10fd933d724c048605cba71f18eac9b
Merge: 6b89f94fbb e16d75839a
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Feb 7 12:40:50 2022 +0300

    Merge branch 'develop' into feature/backup

    # Conflicts:
    #	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
    #	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
    #	common/services/ASC.Data.Backup/Controllers/BackupController.cs
    #	common/services/ASC.Data.Backup/Startup.cs
    #	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
    #	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
    #	products/ASC.Files/Client/public/locales/en/Settings.json
    #	products/ASC.Files/Client/public/locales/ru/Settings.json
    #	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
    #	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
    #	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
    #	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
    #	products/ASC.Files/Client/src/components/panels/StyledPanels.js
    #	products/ASC.Files/Client/webpack.config.js
    #	web/ASC.Web.Client/public/locales/en/Settings.json
    #	web/ASC.Web.Client/public/locales/ru/Settings.json
    #	web/ASC.Web.Client/webpack.config.js

commit 6b89f94fbb8eba76ecae2be85b118b8a4f7481b6
Author: Tatiana Lopaeva <[email protected]>
Date:   Sun Feb 6 20:15:27 2022 +0300

    Web: files: ManualBackup: Refactoring.

commit 80dafc0815415450b9bb7756118277f2b9a0fe9a
Author: Tatiana Lopaeva <[email protected]>
Date:   Sun Feb 6 19:42:40 2022 +0300

    Web: files: RestoreBackup: Refactoring.

commit 988248fbfb12cab18b75ad812216d6c67ecd003b
Author: Tatiana Lopaeva <[email protected]>
Date:   Sun Feb 6 17:09:08 2022 +0300

    Web: Files: AutoBackup: Refactoring modules.

commit f12949409c08420e83dcf1df5b6eee968f72ee1e
Author: Tatiana Lopaeva <[email protected]>
Date:   Sun Feb 6 17:08:29 2022 +0300

    Web: files: AutoBackup: fixed radio button.

commit 2f0677a5320b78a1f746d4a01f21067ae34218f9
Author: Tatiana Lopaeva <[email protected]>
Date:   Sun Feb 6 16:36:45 2022 +0300

    Web: files: AutoBackup: Refactoring.

commit 6ca62331257a04adc95385a11356263529ab6659
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 4 13:40:22 2022 +0300

    Web: Files: AutoBackup: Deleted unnecessary request.

commit 914c4d18af59c31211493a472674827409ab95a5
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 4 13:38:15 2022 +0300

    Web: files: AutoBackup: Moved reset module settings to separate function.

commit 1fdb2b5d598ad05148e93eeddcad9c26d33d2823
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 4 13:32:02 2022 +0300

    WEb: files: AutoBackup: Fix initial hour.

commit 99ab37608d74b024ee4ff0a1f83fec9e8b3c5697
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 4 12:50:16 2022 +0300

    Web: Files: Fixed  incorrect saving of the day of the week, refactoring.

commit 077e81227e1d5724341c9d157bd7df02aa3e2b8b
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Feb 4 11:55:13 2022 +0300

    Web: files: AutoBackup: Refactoring, reset period settings moved to a separate function.

commit bd8d980f6c86a7896d511919535e1900bc58c17d
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 3 16:12:12 2022 +0300

    Web: Files: Fixed manual backup.

commit 92ee0db2f34f2f1cf9563e8bbeac54ea35837158
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Feb 3 15:21:12 2022 +0300

    Web: Files: Refactoring manual backup.

commit 307fc3e9b14e8b0a27b8ad2cd9a0c44f6fcb44a3
Author: SuhorukovAnton <[email protected]>
Date:   Fri Nov 19 13:09:09 2021 +0300

    backup: update nginx config

commit 32770e3f0c2d27f04636096f2ed601dda37ccfcd
Author: SuhorukovAnton <[email protected]>
Date:   Fri Nov 19 12:44:35 2021 +0300

    backup: set tenant before download backup file

commit 2cba76f838c94c34f9f5f145805fd24acaa05f87
Author: SuhorukovAnton <[email protected]>
Date:   Fri Nov 19 12:43:54 2021 +0300

    backup: add "backupFileUpload.ashx"

commit d1fe0950a1d7e0614ce4f54f0827b7f6ce07cf56
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Nov 1 12:20:40 2021 +0300

    Web: AutoBackup: Added disable use of buttons at the time of saving, refactoring.

commit 7b083aad4bd71aa5234d6f79290a90a42f2d4315
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Nov 1 11:27:21 2021 +0300

    Web: Refactoring, fixed non-update stateю

commit cafbe52e7be032f4cc90e4b6fcfa0a924ddb9da3
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Nov 1 11:26:25 2021 +0300

    Web: Backup: Optimization.

commit 28cb2e5519a004001b099907041e9f21c7fd7f2b
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Nov 1 11:26:02 2021 +0300

    Web: Deleted disabling cancel button.

commit 6dadf809bf0194e2907570cb8b12859632a3f347
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 17:13:02 2021 +0300

    Web: Backup: Fixed translation.

commit 94d0cd1afdc7b7c6d3f20081c48ada8b54a258c8
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 16:13:31 2021 +0300

    Web: Refactoring.

commit 59eee87d55411ff7962a0b979ffa581a046170bd
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 15:32:24 2021 +0300

    Web: Backup: Deleted useless code.

commit aa165a709857cc96d32a7b52932533619454f928
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 14:25:06 2021 +0300

    Web: Added common styles.

commit 3eaff28c47857112ab55a0e4751bd67ccafea702
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 14:12:26 2021 +0300

    Web: Fixed month and weekday options.

commit 300791d5097aca98d5b4c5855709f37be29cab46
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 14:11:51 2021 +0300

    Web: Deleted useless code.

commit 33fa8b9dc8e8c11921c556ab81ab6740c99d6f3a
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 11:55:00 2021 +0300

    Web: Fixed day of month.

commit 937f5ef36409e85f3b086a00ee21b934759716ed
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 29 10:53:32 2021 +0300

    Web: Fixed styles for radio button.

commit 424c536ecf15716c81be7739a48880bc93b083bf
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 17:18:33 2021 +0300

    Web: RestoreBackup: Fixed styles.

commit ffa27f357ea6bd72d45920f9aa04ede89e3ee3cd
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 17:18:10 2021 +0300

    Web: Fixed import

commit 3d8a4a1a223c2b653c3d76cc46a5c365ef346b9d
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 16:26:00 2021 +0300

    Web: Refactoring.

commit d114f5c9c6cba472679f7bd1fa0085a280d56361
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 16:23:02 2021 +0300

    Web: RestoreBackup: Renamed files.

commit 6ee6f214453ffedbd5244169b366600cc88c18d9
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 16:13:50 2021 +0300

    Web: Components: Added max width of section header.

commit 07c5dcf5ec7b35e8c028bc01f1db7ea60603ecb3
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 12:17:01 2021 +0300

    Web: Refactoring.

commit 33245ac05d7f6e36621e507b0c14f0c9b88f9a56
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 12:15:52 2021 +0300

    Web: Bakup: Optimization, added a flag about the ability to show the automatic backup moduleю

commit c488fb0d8ea1399bb99af5fdd93e0ea88a3697e1
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 28 12:14:46 2021 +0300

    Web: Common: Added enableRestore api method.

commit 25d5e0f41f3350ee848afe05b56e294f39d1f167
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Oct 27 17:16:33 2021 +0300

    Web: AutoBackup: Fixed error handler.

commit 184975e729f8438a0cc9092bcd06bc5575780bb1
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Oct 27 15:53:01 2021 +0300

    Web: RestoreBackup: Fixed redirect to preparation page when restore from backup list.

commit f6e362d9b59433c9410ef07f7859915f3ec7b7ae
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Oct 27 15:29:14 2021 +0300

    Web: Files: RestoreBackup: Disabled restore button when is restoring process.

commit e1a7d5f256e598fe33acc16aabfed24db12fb2d8
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Oct 27 14:20:44 2021 +0300

    Web: Refactoring, added error handlers.

commit 29ee1eabc668a7cd5bb19c5dec2530bdfa153953
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Oct 27 13:34:56 2021 +0300

    Web: PreparationPortal: Added error message.

commit 86eb4533d9d733bba9fa69db2abc887ef72b1d55
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 25 15:11:46 2021 +0300

    Web :Files: fixed translation.

commit ffe9049e3f50befb4cb226be571f2eb904d47f03
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 25 15:06:56 2021 +0300

    Web: Files: Fixed styles.

commit 8ba2f0c6946bad491e4e2eed32b7049ba86aeae3
Merge: 1803681aef 94a466ed48
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 25 11:02:42 2021 +0300

    Merge branch 'develop' into feature/backup

    # Conflicts:
    #	packages/asc-web-common/api/settings/index.js
    #	web/ASC.Web.Api/Models/SettingsWrapper.cs

commit 1803681aefe8807d99e351084d40a267a623c41c
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 16 18:52:58 2021 +0300

    Web: Backup: Renamed files.

commit f98e866571fc2206ba3dacd8fb5e9ea8e486445d
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 16 18:50:02 2021 +0300

    Web: Settings: Renamed files.

commit be77a8231b45a96076b22acf32457cc2def17157
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 16 18:46:34 2021 +0300

    Web: Settings: ManualBackup: Canceled switching to a new tab when downloading a backup.

commit c5ebdb333b8382d216f95bddefb727fdb151a942
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 16 18:44:04 2021 +0300

    Web: settings: Renamed manual backup.

commit 17628fd64153aa187e1376b8566605fc4c44757a
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 16 18:42:24 2021 +0300

    Web: Settings: AutoBackup: Added correct allocation of the maximum number of copies.

commit cc73e8592c95cfb5d82930692c84d0608357eedc
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 12:08:26 2021 +0300

    Web: AutoBackup: fixed schedule styles.

commit 07481198188b20f3fd4cae558b6b553ca9db2c0e
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 11:51:29 2021 +0300

    Web: AutoBackup: Renamed file, fixed styles.

commit 2275ffdae551523ea19c01f4aa96f4cd6d850447
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 11:07:40 2021 +0300

    Web: AutoBackup: Refactoring.

commit d85e464be3c2144d75162f5fbdade8b863313f5c
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 11:05:20 2021 +0300

    Web: AutoBackup: Renamed files.

commit f74fc731af24ea8f5c8afed285c54a1066d830ee
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 11:00:38 2021 +0300

    Web: AutoBackup: Transferring files to a shared folder

commit 7ad68919769f8cd804698cb9af1a4d15d714f6c2
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 10:28:49 2021 +0300

    WEb: AutoBackup: Renamed files.

commit e6fade3507b65e342bc8e84fd0dc680c1a118e9c
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 10:26:11 2021 +0300

    Web: ManualBackup: Deleted useless prop.

commit 07cb12a312235fab4b6554d0ba7344627783153e
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Oct 14 10:24:35 2021 +0300

    Web: AutoBackup: Added ThirdPartyStorage module, refactoring.

commit 284a26be3d73ac8185777f20fffbb83de03c2c2d
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 11 10:07:52 2021 +0300

    Web: AutoBackup: Disabled button when process copying.

commit 9b2596fe91d4dc2b0c3af6ad2341a2bd189900d5
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 11 09:40:54 2021 +0300

    Web: Changed logic according to layouts.

commit 0badca9ea32cebff29378b837b20f7fa6969623c
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 11 09:38:32 2021 +0300

    Added new translation.

commit 965153850c5122eb94f01710fdf8c22bf1ae2eed
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 11 09:38:08 2021 +0300

    Web: Files: SelectFolderInput/SelectFileInput: Extended the component by adding a reset function to default values.

commit d83a400e0cb1deabaf1c0520e209735c3a6c4e89
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Oct 6 18:15:21 2021 +0300

    Web: Restore: Added changing the height of the content of the modal dialog depending on the number of lines.

commit 12ab20709dd40a478bd99daa477f74162f56e9f8
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 20:02:05 2021 +0300

    Web: Files: Deleted useless code.

commit 539a0fe3be7a91c8fcaa105a94aaea3330ff1bef
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:56:38 2021 +0300

    Web: Restore: cChanging the backup list component to fit the layout.

commit 3123d79138d19c2182f790dafbc887027bacc37d
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:31:43 2021 +0300

    Web: Fixed schedule styles.

commit c12d4b2f845d591cdadce6921048740414fcabcf
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:29:15 2021 +0300

    Web: Fixed schedule styles.

commit 0b9752529f76e0fc761bd94f46da0d6361ab9755
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:27:22 2021 +0300

    Web: Fixed translation.

commit 80fb5a739bca8bc9b8fec638a761153993f739e8
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:23:30 2021 +0300

    Web: Fixed components styles.

commit 37094d5f90984cfac69f371752de788462cd5ac5
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:22:41 2021 +0300

    Web: AutoBackup: Added constants.

commit c82b931cc64555bd184498eaa93edb454b0d5074
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:20:21 2021 +0300

    Web: Changed constants.

commit 4d67a2995522827b4eeb099a72007cedd7d6fde0
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Oct 5 19:13:10 2021 +0300

    Web: Settings: Added translation.

commit 01879779cdab621ab56ce1d5a3a6aadeb470cdc0
Merge: 4d181ec81a 090431d3b5
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Oct 4 15:21:45 2021 +0300

    Merge branch 'develop' into feature/backup

commit 4d181ec81a1b5bcda2e4b6eb87749258a53bcbb0
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 18:34:59 2021 +0300

    Web: Refactoring, deleted useless code.

commit db9ab26bd24016d3ae5f95621c7083b132e3d985
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 18:22:59 2021 +0300

    Web: ManualBackup: Added common components for the storage module, refactoring.

commit ea2a7ab5902025518b50bd30115a0cd7bad2828b
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 18:10:12 2021 +0300

    Web: AutoBackup: Cancel error after saving.

commit 4e2738d0eb65bbdc730d876d9d66827e03f4c741
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 18:04:25 2021 +0300

    Web: AutoBackup: Added common components for the storage module, refactoring.

commit 33a06ab3e67cd642e26b9078ed5642586d6eabf1
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 14:19:29 2021 +0300

    Web: Restore: Disabled path input.

commit c7ea8190e5ede6c83c5e0ba092f59ac5cf04e37e
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 14:16:32 2021 +0300

    Web: Restore: Added logic for storages module.

commit 8ea0af3e14dd2697ab8340af51964a1665531d80
Author: Tatiana Lopaeva <[email protected]>
Date:   Sat Oct 2 14:14:10 2021 +0300

    Web: Сommon code for storages is moved to a separate folder

commit 10d4bbdfd9ff754e33c3945a165cae7e721761d3
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 20:27:00 2021 +0300

    Web: Fixed property after merge.

commit c4029bcd08107203168371d9c3e3986400c34cb9
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 20:26:27 2021 +0300

    Web: Restore: Deleted useless code.

commit 171c661bc11ae973c7a4f643fae46606622bc1ae
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 20:25:53 2021 +0300

    Web: Restore: Added Google Cloud Storage.

commit 97f792014cf05ca4840163e7791261130a66674f
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 14:05:40 2021 +0300

    Web: Fixed restore styles.

commit 361a9deea08caf499dda3dc65f3b07920f8c9504
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 13:38:01 2021 +0300

    Web: Restore: Refactoring.

commit c9e58f197a97a4caed525d8d776745fc0769b4d6
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 13:19:50 2021 +0300

    Web: Added width input for restore backup.

commit e0fd051b12b89c60913863a0be4c7176c8a8220c
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 12:59:34 2021 +0300

    Web: Fixed restore styles.

commit edb92c156efb97e5207c448cabf75e58152fb15a
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 12:47:28 2021 +0300

    Web: Fixed description styles of modules.

commit de790aace7cad293c0a4b139d96b8c77cf028595
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 12:35:35 2021 +0300

    Web: Deleted useless code.

commit da05a2c8a6cebf2e22da421a5c2601e110c337f2
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 12:34:53 2021 +0300

    Web: Separating styles for modules.

commit 7bd43d92c64ca9629ba9c7f5addad8eefa5b5976
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 12:15:19 2021 +0300

    Web: Files: Refactoring.

commit ec13120919c394e830c3fd709cd6f5679534fd1a
Author: Tatiana Lopaeva <[email protected]>
Date:   Fri Oct 1 11:50:44 2021 +0300

    Web: ManualBackup: Changed styles according to layouts

commit 2c56a3af909eba1433863cf0466dd936a8503860
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Sep 30 10:06:58 2021 +0300

    Web: Restore backup: Refactoring after mergeю

commit 57804746a5cb7ae586039546712c3103b9941370
Author: Tatiana Lopaeva <[email protected]>
Date:   Thu Sep 30 09:42:06 2021 +0300

    Web: Restore backup: Refactoring after merge.

commit 6c37ac8f4bafc97807d4670830822d55c5d88338
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Sep 29 15:38:04 2021 +0300

    Web: Deleted useless code.

commit 274efac9fc368ac38ac4abadc42ee9f328892662
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Sep 29 13:00:27 2021 +0300

    Web: Deleted useless code.

commit 3290f6592b4997128fc8d3016db3771b9be8a747
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Sep 29 11:45:07 2021 +0300

    Web: Optimization, refactoring.

commit 4c9fbcf4a276394619bfdf24348dd14fc8a43060
Author: Tatiana Lopaeva <[email protected]>
Date:   Wed Sep 29 11:18:49 2021 +0300

    Web: Added session saving for the selected storage, refactoring.

commit 74dea7829f145c43e3ebe96e80833cb8641c2cbd
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 19:27:12 2021 +0300

    Web: Renamed files.

commit 4d986ac3e5018db9303399c9e80b1040ffb42b99
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 19:15:21 2021 +0300

    Web: Added folder for third party storages.

commit 152b3fa43c2c8a1a8ca1be365dbbf19bb87edeed
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 19:11:15 2021 +0300

    Web: Created a reusable generic error function for storages.

commit 8082cc23b729b77581f1e047d25a0b32f367de0e
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 18:12:08 2021 +0300

    Web: Refactoring.

commit e23f8945e054a4e500ac5f7d89937950dea840a2
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 18:10:27 2021 +0300

    Web: Added constants.

commit 335eaeaba74f13aa9027cc7a246d1c0b73cfc85a
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 18:10:11 2021 +0300

    Web: Common: Added third party storages enum.

commit 14279575c6266151ea44051c282df832ca502380
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 17:57:51 2021 +0300

    Web: Renamed function.

commit fcb6e86f736c46a8309efdd3cdcc6f0032c62e24
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 17:56:02 2021 +0300

    Web: Renamed function.

commit b8ff0156328cc5cf93e7852066daf81ccfad742a
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 17:53:26 2021 +0300

    Web: Created a reusable generic copy function for storages.

commit 6b1aaca6b69a29220a2425399fa88757ab53d36a
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 15:55:40 2021 +0300

    Web: Deleted useless code.

commit 6476204040b961e6b2d12d99b3d8012bdebf06ba
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 15:51:55 2021 +0300

    Web: Created a reusable generic copy function for modules.

commit c6041b19724856d913e0ab2d72ea3cce1428dcc6
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 13:42:52 2021 +0300

    Web: Fixed showing files list row for backup list, removed checkbox for backup list.

commit 856ae813f8db18be667bf208458306e2eee86964
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 12:07:50 2021 +0300

    Web: Files: Set for first load to false to display folders as a tree.

commit d3eafd018683e5e5b36877abf71b90c276ca0b22
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 28 12:02:20 2021 +0300

    Web: Fixed after merge, deleted useless files after merge.

commit 6b0bf36a3109fd76d1c3ea55e7d77f8313925ff6
Author: Tatiana Lopaeva <[email protected]>
Date:   Tue Sep 21 10:21:12 2021 +0300

    Web: Files: Fixed after merge.

commit 4d142875905726c9f3adc1b3ee34f51b2d8fdfa0
Author: pavelbannov <[email protected]>
Date:   Mon Sep 20 21:30:29 2021 +0300

    fix backup

commit ec40bcc8287fbe8358efdf744bcf0ff13eb0ca01
Merge: aa6c02b190 5f3638d08e
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Sep 20 16:27:28 2021 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit aa6c02b190d05867f612ba9b62d9486488c6e18c
Merge: 67902f2072 0d50909bb7
Author: Tatiana Lopaeva <[email protected]>
Date:   Mon Sep 20 16:26:34 2021 +0300

    Merge branch 'develop' into feature/backup

    # Conflicts:
    #	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
    #	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
    #	common/services/ASC.Data.Backup/Controllers/BackupController.cs
    #	packages/asc-web-common/api/settings/index.js
    #	packages/asc-web-common/components/PrivateRoute/index.js
    #	packages/asc-web-common/store/SettingsStore.js
    #	products/ASC.Files/Client/public/locales/en/SelectFile.json
    #	products/ASC.Files/Client/public/locales/ru/SelectFile.json
    #	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
    #	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
    #	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
    #	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
    #	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
    #	products/ASC.Files/Client/src/components/panels/StyledPanels.js
    #	products/ASC.Files/Client/webpack.config.js
    #	web/ASC.Web.Api/Controllers/SettingsController.cs
    #	web/ASC.Web.Api/Models/SettingsWrapper.cs
    #	web/ASC.Web.Client/src/Shell.jsx

commit 67902f207287177710d646b8d41380313474f242
Merge: 3d662a53ee 5a16c5a6ff
Author: TatianaLopaeva <[email protected]>
Date:   Wed Jul 7 15:15:59 2021 +0300

    Merge branch 'develop' into feature/backup

commit 5f3638d08ebc814cd572e461c0e4e09624b4802f
Author: SuhorukovAnton <[email protected]>
Date:   Thu Jul 1 15:33:50 2021 +0300

    bugfix

    add "IsCompleted" in end restoring
    fix "ProgressQueue.GetTasks"

commit 3d662a53ee986fdbe88a7f27d939ebacfd6cdc2d
Author: TatianaLopaeva <[email protected]>
Date:   Thu Jul 1 12:12:09 2021 +0300

    Web: Added transition to the preparation page.

commit 40e0d52a90bf4de693bd33e64927927a6d76aeb1
Merge: b419c640bc 58cdc94843
Author: TatianaLopaeva <[email protected]>
Date:   Thu Jul 1 09:43:44 2021 +0300

    Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup

commit b419c640bc01b3d9e65289e44eac7400cac491b9
Author: TatianaLopaeva <[email protected]>
Date:   Wed Jun 30 20:09:00 2021 +0300

    Web: Settings: Added preparation portal page.

commit 58cdc94843bfa2f1114246d62847259bbf481b3d
Author: SuhorukovAnton <[email protected]>
Date:   Wed Jun 30 17:26:46 2021 +0300

    add Tenant status in settings and refactoring tenantStatusFilter

commit 349cdb9853afda4059312550a764285fcb16099f
Author: SuhorukovAnton <[email protected]>
Date:   Wed Jun 30 16:38:07 2021 +0300

    add check if restoring or transfering

commit d04484a2ebe54a446f5471b7f9303dbbe1a0ce37
Author: SuhorukovAnton <[email protected]>
Date:   Wed Jun 30 16:33:49 2021 +0300

    backup: add api "enablerestore"

commit db7954ee3124d2c5166c5526390a90235b4083e2
Merge: 976b8443ad b7d834d3c6
Author: TatianaLopaeva <[email protected]>
Date:   Wed Jun 30 15:54:45 2021 +0300

    Merge branch 'develop' into feature/backup

commit 976b8443ad2f7dee39ff8bd3d57c6151499dd50a
Author: TatianaLopaeva <[email protected]>
Date:   Wed Jun 30 12:07:22 2021 +0300

    Web: Settings: Added notify to modal dialog.

commit 114e5611db30c00341fda19e220c24846896e327
Author: TatianaLopaeva <[email protected]>
Date:   Wed Jun 30 11:21:38 2021 +0300

    WEb: Settings: Manual Backup: Added removing info from session storage.

commit f7893c5192c541f1c3d653ae031a66d0d41186d6
Author: TatianaLopaeva <[email protected]>
Date:   Wed Jun 30 11:11:01 2021 +0300

    WEb: Settings: RestoreBackup: Added restore portal from backup list.

commit 095eba6c3d27586eee21b00be026b5183b33ac8e
Author: TatianaLopaeva <[email protected]>
Date:   Tue Jun 29 18:48:31 2021 +0300

    Web: Settings: RestoreBackup: Added styles.

commit 78f6dc595ace322c81427ec31c24058e6a5f424c
Author: TatianaLopaeva <[email protected]>
Date:   Tue Jun 29 18:47:57 2021 +0300

    Web: Settings: RestoreBackup: Move the function getOption of third party storage module to a separate file

commit 31e8a7fdced5fd27cb14be07bf5c2a85feab8d44
Author: TatianaLopaeva <[email protected]>
Date:   Tue Jun 29 11:48:35 2021 +0300

    Web: Settings: RestoreBackup:Added local file module, added start restore function.

commit ffcd78d9c46b31c9d74161035b4d2aaa68658f6d
Author: TatianaLopaeva <[email protected]>
Date:   Mon Jun 28 14:39:27 2021 +0300

    Web: Files: SelectFileDialog: Deleted useless code.

commit 2f896cc65b903dfbc032850ca3c5f114552cadb5
Author: TatianaLopaeva <tatiana.lopaeva@onlyoffice…
  • Loading branch information
@EugeneKozyrev
EugeneKozyrev committed Mar 28, 2022
1 parent dadcfa4 commit 5b977cf
Show file tree
Hide file tree
Showing 257 changed files with 8,487 additions and 1,123 deletions.
17 changes: 16 additions & 1 deletion common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Net;
using System;
using System.Linq;
using System.Net;

using ASC.Common;
using ASC.Common.Logging;
Expand All @@ -15,6 +17,8 @@ namespace ASC.Api.Core.Middleware
public class TenantStatusFilter : IResourceFilter
{
private readonly ILog log;
private readonly string[] passthroughtRequestEndings = new[] { "preparation-portal", "getrestoreprogress", "settings", "settings.json" }; //TODO add or update when "preparation-portal" will be done


public TenantStatusFilter(IOptionsMonitor<ILog> options, TenantManager tenantManager)
{
Expand Down Expand Up @@ -44,6 +48,17 @@ public void OnResourceExecuting(ResourceExecutingContext context)
log.WarnFormat("Tenant {0} is not removed or suspended", tenant.TenantId);
return;
}

if (tenant.Status == TenantStatus.Transfering || tenant.Status == TenantStatus.Restoring)
{
if (passthroughtRequestEndings.Any(path => context.HttpContext.Request.Path.ToString().EndsWith(path, StringComparison.InvariantCultureIgnoreCase)))
{
return;
}
context.Result = new StatusCodeResult((int)HttpStatusCode.Forbidden);
log.WarnFormat("Tenant {0} is {1}", tenant.TenantId, tenant.Status);
return;
}
}
}
}
12 changes: 8 additions & 4 deletions common/ASC.Common/Threading/DistributedTaskQueue.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public void QueueTask(DistributedTaskProgress taskProgress)
}

public void QueueTask(Action<DistributedTask, CancellationToken> action, DistributedTask distributedTask = null)
{
{
if (distributedTask == null)
{
distributedTask = new DistributedTask();
Expand Down Expand Up @@ -220,14 +220,15 @@ public void QueueTask(Func<DistributedTask, CancellationToken, Task> action, Dis
var token = cancelation.Token;
Cancelations[distributedTask.Id] = cancelation;

var task = new Task(async () =>
var task = new Task(() =>
{
var t = action(distributedTask, token);
t.ConfigureAwait(false)
.GetAwaiter()
.OnCompleted(() => OnCompleted(t, distributedTask.Id));
await t;
}, token, TaskCreationOptions.LongRunning);

task.ConfigureAwait(false);

distributedTask.Status = DistributedTaskStatus.Running;

Expand Down Expand Up @@ -328,7 +329,10 @@ private void OnCompleted(Task task, string id)
if (distributedTask != null)
{
distributedTask.Status = DistributedTaskStatus.Completed;
distributedTask.Exception = task.Exception;
if (task.Exception != null)
{
distributedTask.Exception = task.Exception;
}
if (task.IsFaulted)
{
distributedTask.Status = DistributedTaskStatus.Failted;
Expand Down
17 changes: 8 additions & 9 deletions common/ASC.Core.Common/Billing/BillingClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,19 @@ public class BillingClient
private readonly string _billingKey;
private readonly string _billingSecret;
private readonly bool _test;

private readonly IHttpClientFactory _httpClientFactory;
private const int AvangatePaymentSystemId = 1;

static readonly HttpClient HttpClient = new HttpClient();


public BillingClient(IConfiguration configuration)
: this(false, configuration)
public BillingClient(IConfiguration configuration, IHttpClientFactory httpClientFactory)
: this(false, configuration, httpClientFactory)
{
}

public BillingClient(bool test, IConfiguration configuration)
public BillingClient(bool test, IConfiguration configuration, IHttpClientFactory httpClientFactory)
{
_test = test;

_httpClientFactory = httpClientFactory;
var billingDomain = configuration["core:payment-url"];

_billingDomain = (billingDomain ?? "").Trim().TrimEnd('/');
Expand Down Expand Up @@ -234,7 +232,8 @@ private string Request(string method, string portalId, params Tuple<string, stri
request.Headers.Add("Authorization", CreateAuthToken(_billingKey, _billingSecret));
}

HttpClient.Timeout = TimeSpan.FromMilliseconds(60000);
var httpClient = _httpClientFactory.CreateClient();
httpClient.Timeout = TimeSpan.FromMilliseconds(60000);

var data = new Dictionary<string, List<string>>();
if (!string.IsNullOrEmpty(portalId))
Expand All @@ -257,7 +256,7 @@ private string Request(string method, string portalId, params Tuple<string, stri
request.Content = new StringContent(body, Encoding.UTF8, "application/json");

string result;
using (var response = HttpClient.Send(request))
using (var response = httpClient.Send(request))
using (var stream = response.Content.ReadAsStream())
{
if (stream == null)
Expand Down
8 changes: 6 additions & 2 deletions common/ASC.Core.Common/Billing/TariffService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
Expand Down Expand Up @@ -162,6 +163,7 @@ public class TariffService : ITariffService
internal TariffServiceStorage TariffServiceStorage { get; set; }
internal IOptionsMonitor<ILog> Options { get; set; }
public BillingClient BillingClient { get; }
public IHttpClientFactory HttpClientFactory { get; }

public readonly int ACTIVE_USERS_MIN;
public readonly int ACTIVE_USERS_MAX;
Expand All @@ -181,7 +183,8 @@ public TariffService(
TariffServiceStorage tariffServiceStorage,
IOptionsMonitor<ILog> options,
Constants constants,
BillingClient billingClient)
BillingClient billingClient,
IHttpClientFactory httpClientFactory)
: this()

{
Expand All @@ -193,6 +196,7 @@ public TariffService(
TariffServiceStorage = tariffServiceStorage;
Options = options;
BillingClient = billingClient;
HttpClientFactory = httpClientFactory;
CoreBaseSettings = coreBaseSettings;
Test = configuration["core:payment:test"] == "true";
int.TryParse(configuration["core:payment:delay"], out var paymentDelay);
Expand Down Expand Up @@ -640,7 +644,7 @@ private BillingClient GetBillingClient()
{
try
{
return new BillingClient(Test, Configuration);
return new BillingClient(Test, Configuration, HttpClientFactory);
}
catch (InvalidOperationException ioe)
{
Expand Down
4 changes: 3 additions & 1 deletion common/ASC.Core.Common/Notify/Context.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
using System.Collections.Generic;
using System.Linq;

using ASC.Common;
using ASC.Common.Logging;
using ASC.Notify.Channels;
using ASC.Notify.Engine;
Expand All @@ -39,7 +40,8 @@
using Microsoft.Extensions.Options;

namespace ASC.Notify
{
{
[Singletone]
public sealed class Context : INotifyRegistry
{
public const string SYS_RECIPIENT_ID = "_#" + _SYS_RECIPIENT_ID + "#_";
Expand Down
36 changes: 30 additions & 6 deletions common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

using ASC.Api.Utils;
Expand All @@ -14,7 +15,6 @@
using ASC.Notify.Cron;
using ASC.Web.Core.PublicResources;
using ASC.Web.Studio.Core;
using ASC.Web.Studio.Core.Backup;
using ASC.Web.Studio.Utility;

namespace ASC.Data.Backup
Expand All @@ -31,8 +31,11 @@ public class BackupAjaxHandler
private UserManager UserManager { get; }
private TenantExtra TenantExtra { get; }
private ConsumerFactory ConsumerFactory { get; }
private BackupFileUploadHandler BackupFileUploadHandler { get; }
private BackupService BackupService { get; }
private TempPath TempPath { get; }

private const string BackupTempFolder = "backup";
private const string BackupFileName = "backup.tmp";

#region backup

Expand All @@ -47,7 +50,7 @@ public BackupAjaxHandler(
UserManager userManager,
TenantExtra tenantExtra,
ConsumerFactory consumerFactory,
BackupFileUploadHandler backupFileUploadHandler)
TempPath tempPath)
{
TenantManager = tenantManager;
MessageService = messageService;
Expand All @@ -58,8 +61,8 @@ public BackupAjaxHandler(
UserManager = userManager;
TenantExtra = tenantExtra;
ConsumerFactory = consumerFactory;
BackupFileUploadHandler = backupFileUploadHandler;
BackupService = backupService;
TempPath = tempPath;
}

public void StartBackup(BackupStorageType storageType, Dictionary<string, string> storageParams, bool backupMail)
Expand Down Expand Up @@ -263,7 +266,7 @@ public void StartRestore(string backupId, BackupStorageType storageType, Diction

if (restoreRequest.StorageType == BackupStorageType.Local && !CoreBaseSettings.Standalone)
{
restoreRequest.FilePathOrId = BackupFileUploadHandler.GetFilePath();
restoreRequest.FilePathOrId = GetTmpFilePath();
}
}

Expand All @@ -280,7 +283,7 @@ public BackupProgress GetRestoreProgress()
return result;
}

private void DemandPermissionsRestore()
public void DemandPermissionsRestore()
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);

Expand All @@ -289,6 +292,15 @@ private void DemandPermissionsRestore()
throw new BillingException(Resource.ErrorNotAllowedOption, "Restore");
}

public void DemandPermissionsAutoBackup()
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);

if (!SetupInfo.IsVisibleSettings("AutoBackup") ||
(!CoreBaseSettings.Standalone && !TenantManager.GetTenantQuota(TenantManager.GetCurrentTenant().TenantId).AutoBackup))
throw new BillingException(Resource.ErrorNotAllowedOption, "AutoBackup");
}

#endregion

#region transfer
Expand Down Expand Up @@ -342,6 +354,18 @@ private int GetCurrentTenantId()
return TenantManager.GetCurrentTenant().TenantId;
}

public string GetTmpFilePath()
{
var folder = Path.Combine(TempPath.GetTempPath(), BackupTempFolder, TenantManager.GetCurrentTenant().TenantId.ToString());

if (!Directory.Exists(folder))
{
Directory.CreateDirectory(folder);
}

return Path.Combine(folder, BackupFileName);
}

public class Schedule
{
public BackupStorageType StorageType { get; set; }
Expand Down
Loading

0 comments on commit 5b977cf

Please sign in to comment.