d6cfa8aa0f
Web: Settings: Restore Backup: Added checkbox to notify users, added translation for it.
2021-06-09 17:26:36 +03:00
8b32eecd98
Web: Settings: Restore Backup: Was Done:
...
- added restore backup page
- added go to the restore backup page
- added translations
- added warning text
- added the ability to recover data if user agree with the warning
2021-06-09 17:13:22 +03:00
8080fd10e6
Web: Settings: Auto Backup: Added Common translation for buttons.
2021-06-09 08:58:13 +03:00
6fee55ac21
Web: Settings: Added tKey for data management category and Fixed translations.
2021-06-08 15:52:53 +03:00
6db87a3907
Backup: Fixed after merge.
2021-06-08 15:32:28 +03:00
3ef16948fc
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
2021-06-08 15:03:49 +03:00
1cbe04f044
Merge pull request #270 from ONLYOFFICE/feature/remove-unused-dep
...
Feature/remove unused dep
2021-06-04 15:06:47 +03:00
944966b67b
WebSocker: repair service
2021-06-03 16:13:22 +03:00
43de25b62a
Merge branch 'develop' into feature/remove-unused-dep
...
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
bcc9e6c34b
ResManager: additional feature
2021-06-03 12:48:25 +03:00
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
...
Feature/thirdparty for two frameworks
2021-06-03 12:19:27 +03:00
cc073f46e3
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
2021-06-02 17:04:12 +03:00
3635905167
Backup: fixed link
2021-06-02 17:02:19 +03:00
e05f2bfec5
Web: Settings: Manual Backup: Fixed styles.
2021-06-02 16:41:48 +03:00
d134398167
Storage: fix resolve
2021-06-02 16:28:05 +03:00
d741e91e96
Backup: fixed notify
2021-06-02 15:00:36 +03:00
c91b1090f9
Web: Settings: Manual/Auto Backup: Fixed required fields for aws storage.
2021-06-02 14:47:17 +03:00
cf3e315e92
Merge pull request #269 from ONLYOFFICE/feature/translations
...
Feature/translations
2021-06-02 14:24:10 +03:00
d8dc1d75ad
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
2021-06-02 14:07:45 +03:00
0aa6a71ea8
Merge branch 'develop' into feature/translations
2021-06-02 14:05:43 +03:00
bd299a718b
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 13:55:19 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
f9e53d038f
Web: People: fixed onDeletePersonalDataClick
2021-06-02 13:46:25 +03:00
28c5325137
Web: Settings: Manual/Auto Backup: Splitted third-party storage module for manual and auto modules.
2021-06-02 13:19:42 +03:00
36bc5a4172
Backup: fix
2021-06-02 12:58:46 +03:00
Artem Tarasov
418f7161c5
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 12:22:57 +03:00
Artem Tarasov
2d8b044458
Web: fixed usage translation key "Settings" in NavMenu
2021-06-02 12:22:38 +03:00
d187b2767a
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 12:04:36 +03:00
60a7e84f60
Web: ProfileAction : Added locale usage for DateInput
2021-06-02 12:04:26 +03:00
77242ad326
Web: Client: fixed TimeZone translation
2021-06-02 11:58:41 +03:00
33ccfa550b
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
2021-06-02 11:53:29 +03:00
c4a89a9e50
Web: People: fixed translation of "Birthdate", duplicated translation of "Birthdate" moved to a common file
2021-06-02 11:49:35 +03:00
Artem Tarasov
5df2788783
Web: added new translation key "SuccessDeletePersonalData" for "delete-personal-data" in context options
2021-06-02 11:36:23 +03:00
11640e211c
Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage"
2021-06-02 11:33:26 +03:00
e9c5ca41ae
fix
2021-06-02 11:26:58 +03:00
Artem Tarasov
cc338e62d0
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 11:23:47 +03:00
Artem Tarasov
883130c002
Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog
2021-06-02 11:23:02 +03:00
3f964a1649
Web: Fix not translated toast issue ("Successfully sent")
2021-06-02 11:12:47 +03:00
929adc773a
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 10:59:15 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
7ce24557e0
Web: Client: fixed toast translations
2021-06-02 10:58:11 +03:00
ad12ac19c3
Web: Files: removed useless toast translations
2021-06-02 10:46:17 +03:00
948ee10020
Web: Settings: Auto Backup: Refactoring.
2021-06-02 10:19:55 +03:00
2bfc86c506
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
2021-06-01 21:16:44 +03:00
1c3a37508d
Web: Settings: Manual/Auto: Splitted third-party storage module into components and separated of logic for repositories.
2021-06-01 21:14:16 +03:00
d3e30eeb6c
Config: Setup cultures
2021-06-01 20:11:01 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
72f27e9b55
Web: Tests: Added new NotTranslatedToastsTest()
2021-06-01 20:00:36 +03:00
46c198f89d
Web: Added new 'ru' translations;
2021-06-01 19:04:45 +03:00
SuhorukovAnton
7fd550dfe8
Merge branch 'develop' into feature/thirdparty_for_two_frameworks
2021-06-01 17:49:10 +03:00
