Commit Graph

130 Commits

Author SHA1 Message Date
4d67a29955 Web: Settings: Added translation. 2021-10-05 19:13:10 +03:00
171c661bc1 Web: Restore: Added Google Cloud Storage. 2021-10-01 20:25:53 +03:00
edb92c156e Web: Fixed description styles of modules. 2021-10-01 12:47:28 +03:00
ec13120919 Web: ManualBackup: Changed styles according to layouts 2021-10-01 11:50:44 +03:00
aa6c02b190 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
2021-09-20 16:26:34 +03:00
fb922f04d6 Web: Client: change About translations 2021-08-03 16:01:31 +03:00
b419c640bc Web: Settings: Added preparation portal page. 2021-06-30 20:09:00 +03:00
31e8a7fdce Web: Settings: RestoreBackup:Added local file module, added start restore function. 2021-06-29 11:48:35 +03:00
fce75fdfa5 Web: Settings/Files: Added methods for get backup list, added fixed size list, update SelectFileDialog, refactoring, moved files list with styles to the component. 2021-06-25 19:15:55 +03:00
4465261d64 Web: Settings/Files: Added files list to the backup list component, update files list component. 2021-06-25 10:38:54 +03:00
22e393cdd2 Web:Settings: Backup: Added translation. 2021-06-21 21:12:26 +03:00
ae17671043 Merge branch 'develop' into feature/backup
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
2021-06-18 18:08:38 +03:00
0663ed7f16 Merge branch 'develop' into feature/backup
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-06-10 11:56:32 +03:00
f62e7011ce Web: Settings: Restore Backup: Added BackupListModalDialog component fro showing backup list. 2021-06-10 10:36:18 +03:00
d6cfa8aa0f Web: Settings: Restore Backup: Added checkbox to notify users, added translation for it. 2021-06-09 17:26:36 +03:00
a3c5eea477 Web: Client: deleted unused translations key 2021-06-09 17:16:37 +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
5ea562e996 Web: Client: fixed translations 2021-06-09 02:43:07 +03:00
b7ce4a35e7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
# Conflicts:
#	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/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
6fee55ac21 Web: Settings: Added tKey for data management category and Fixed translations. 2021-06-08 15:52:53 +03:00
d881c48b4b Web: Client: fixed translations 2021-06-08 15:20:03 +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
ce35405190 Web: Client: deleted duplicate key 2021-06-03 20:25:35 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
43ff5210bf Web: Client: access portal page refactoring 2021-06-02 20:30:54 +03:00
11640e211c Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage" 2021-06-02 11:33:26 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
6b56b539c5 Web: Update EN language 2021-05-31 17:10:34 +03:00
889c99243e Web: Client: added translations 2021-05-31 13:05:19 +03:00
66f36bf0a6 Web: Client: added empty screen 2021-05-31 12:51:23 +03:00
f0f6400563 Web: Client: commentary changes 2021-05-30 22:40:44 +03:00
f9feb35afc Merge branch 'develop' into feature/backup 2021-05-30 20:57:01 +03:00
Artem Tarasov
102f26ed3c Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34 Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json" 2021-05-27 11:57:20 +03:00
b57da432bf Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common. 2021-05-27 11:50:11 +03:00
Artem Tarasov
a12ab6c970 Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json" 2021-05-26 18:30:57 +03:00
Artem Tarasov
d5ddeb4c42 Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json" 2021-05-26 17:58:05 +03:00
541b14c8fe Web: moved translationKeys "DisableUserButton", "NotFoundLanguage" 2021-05-26 16:40:02 +03:00
bf63128496 Web: moved translationKeys "LastName", "Language", "Mail" 2021-05-26 16:28:58 +03:00
2c5b95e352 Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage" 2021-05-26 16:06:40 +03:00
252fef7ae3 Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError" 2021-05-26 14:36:58 +03:00
3c1e322406 Web: moved translationKeys "Profile", "RecoverErrorMessage" 2021-05-26 14:21:11 +03:00
49bf2618d2 Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected" 2021-05-26 13:35:11 +03:00
4228b0a5dc Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-25 17:26:12 +03:00
2452ec957d Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json" 2021-05-25 17:16:09 +03:00
Artem Tarasov
671f98519a Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json" 2021-05-25 12:49:56 +03:00
60679a5da7 Web: Moved translationKeys "Disabled", "Close" 2021-05-25 11:43:42 +03:00
e01af3fd20 Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json" 2021-05-24 19:47:26 +03:00
a80890f7cc Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json" 2021-05-24 19:40:26 +03:00
f94c19385f Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json" 2021-05-24 19:31:41 +03:00