Commit Graph

7376 Commits

Author SHA1 Message Date
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
2be10b8bd9 Settings: added personal settings 2021-06-02 19:13:47 +03:00
Artem Tarasov
d960ae6220 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +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
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
77242ad326 Web: Client: fixed TimeZone translation 2021-06-02 11:58:41 +03:00
11640e211c Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage" 2021-06-02 11:33:26 +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
Artem Tarasov
a38195d506 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	products/ASC.CRM/Client/src/custom.scss
#	products/ASC.Calendar/Client/src/custom.scss
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/src/custom.scss
#	products/ASC.People/Client/src/custom.scss
#	products/ASC.Projects/Client/src/custom.scss
#	web/ASC.Web.Client/src/custom.scss
#	web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
95dbfb8c5c Merge branch 'develop' into feature/translations 2021-06-01 20:02:48 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
e3b5ac774a Web: Tests: Added new 'de' translations; 2021-06-01 10:56:47 +03:00
7beccd192b Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue) 2021-05-31 20:33:12 +03:00
2018820472 Merge branch 'develop' into feature/crm-migrate 2021-05-31 19:37:51 +03:00
061b4e46e7 Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue) 2021-05-31 19:11:58 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
f78742ac39 Web: Fix UselessModuleTranslationKeysTest issues 2021-05-31 17:35:25 +03:00
6b56b539c5 Web: Update EN language 2021-05-31 17:10:34 +03:00
f30b84fddf Web: Client: fixed group buttons menu 2021-05-31 13:57:19 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
889c99243e Web: Client: added translations 2021-05-31 13:05:19 +03:00
6b20b6ee4a Web: Client: added AddAdmin button 2021-05-31 13:05:06 +03:00
8381b7da75 Merge branch 'feature/access-rights-admins' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins 2021-05-31 12:57:43 +03:00
611a6a67b4 Web: Client: fixed 2021-05-31 12:53:48 +03:00
66f36bf0a6 Web: Client: added empty screen 2021-05-31 12:51:23 +03:00
Alexey Kostenko
df44f98e53 Web: Client: Fixed the number of administrators on access-rights page 2021-05-31 12:45:27 +03:00
7026b19db0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-31 09:23:53 +03:00
Alexey Kostenko
0374ff6c5d Web: Client: Fixed adding and removing users (with paging), set url filter when come from access-rights page 2021-05-31 09:23:24 +03:00
f0f6400563 Web: Client: commentary changes 2021-05-30 22:40:44 +03:00
Alexey Kostenko
90973fa769 Web: Client: Fixed header name on admins page, fixed value of admins on access-rights page, added filter to url on admins page 2021-05-30 19:11:16 +03:00
68d9f90faf Web: Client: commentary changes 2021-05-30 17:27:31 +03:00
f993108d69 Web: Common: commentary changes 2021-05-30 17:26:30 +03:00
Alexey Kostenko
095b79dc31 Web: Client: Added Paging on admins page 2021-05-30 16:00:05 +03:00
74064fc76d Merge branch 'develop' into feature/translations 2021-05-29 21:59:02 +03:00
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
Artem Tarasov
215c933d9e Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json" 2021-05-28 13:28:40 +03:00
12bcf816b5 Web: Client: added new translations keys 2021-05-28 12:09:10 +03:00
d0bbcb8d5a Files: moved from 08a01422 2021-05-28 11:22:35 +03:00
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
Alexey Kostenko
7435ee0c7b Web: Client: Fixed pages (infinite loading, when portal has no admins) 2021-05-27 19:12:50 +03:00
Alexey Kostenko
b1cf90b591 Web: Client: Admins page - style fix (temporary solution for desktop) 2021-05-27 15:40:11 +03:00
Alexey Kostenko
4269bde116 Web: Client: Added rows loader to admins page, fixed when switching between admins - access-rights (Blank screen for a few seconds), small refactoring loader on access-rights page 2021-05-27 15:22:25 +03:00
90821d3fe1 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-27 12:15:53 +03:00
f5909cc0e0 Web: Temporary removed minimal translations lng files 2021-05-27 12:14:36 +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
Alexey Kostenko
bc5fd2aa9d Web: Client: Added loader on access-rights page 2021-05-27 11:47:37 +03:00
7d1af40f6a Web: Fix translation tests issues 2021-05-27 11:27:27 +03:00
25ac98e272 Merge branch 'develop' into feature/translations
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/DeleteDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
Alexey Kostenko
727804180b Revert "Web: Common: Added InfiniteLoader"
This reverts commit 09ff37ac0f.
2021-05-27 10:38:06 +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
d8adef733c ASC.Files: moved from 08a01422 2021-05-26 16:54:46 +03:00
364fc6bbeb Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-26 16:40:10 +03:00
Artem Tarasov
1616b8e5e6 Web: deleted duplicated translation keys "PasswordRecoveryPlaceholder", "RegisterPlaceholder", instead of added key "RegistrationEmail" 2021-05-26 16:43:52 +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
Artem Tarasov
1aba7c5dbe Web: Client: Settings: fixed max-width for unselected TreeNode 2021-05-25 19:17:17 +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
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +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
43e65a51d1 Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json" 2021-05-24 19:22:20 +03:00
b8dd8b3048 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-24 19:07:46 +03:00
1e954b15d7 Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json" 2021-05-24 19:05:29 +03:00
4e32c53567 Web: Moved translationKeys "About" to Common.json 2021-05-24 18:36:31 +03:00
b8edf32f87 Web: Moved translationKeys "User", "Warning" to Common.json 2021-05-24 17:55:14 +03:00
Alexey Kostenko
09ff37ac0f Web: Common: Added InfiniteLoader 2021-05-24 16:24:11 +03:00
c652209b49 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-24 13:58:54 +03:00
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
Artem Tarasov
098e04891c Web: deleted "WhiteLabel" translation key 2021-05-22 01:31:50 +03:00
Artem Tarasov
28dc774e26 Web: Client: Settings: fixed tKey for AccessRights' 2021-05-21 18:47:08 +03:00
Artem Tarasov
11166ed85a Web: Client: fixed usage translation keys for Settings page 2021-05-21 18:37:16 +03:00
6b7cab8236 Web: Moved translationKeys "Sending", "RecoverProcessSending", "ThirdPartyProcessSending" and "RegisterProcessSending" to "/static/locales/{lng}/Common.json" 2021-05-21 18:06:31 +03:00
4fdeec00e7 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 17:59:37 +03:00
e83d1d5922 Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json" 2021-05-21 17:59:28 +03:00
ae56fc0ecc Web: fixed translation usage for keys "Alert", "Done", "Info" 2021-05-21 17:57:55 +03:00
c664e80ae8 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-21 17:39:01 +03:00
9960cef423 Web: Removed useless translations "OwnerSettings", "PortalSecurity", "ProductsAndInstruments" 2021-05-21 17:38:55 +03:00
b0bc8ec720 Web: Removed useless translations (DataManagement, DeactivationDeletionPortal, GreetingSettingsTitle, GreetingTitle, LoginHistoryNav) 2021-05-21 17:31:03 +03:00
66b30360de 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-21 17:21:16 +03:00
389ee969a2 Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json" 2021-05-21 17:19:00 +03:00
81febda210 Web: Removed useless translations "CommunityUserCapability", "CrmProduct", "CRMUserCapabilityCreate", "CRMUserCapabilityEdit" 2021-05-21 17:04:16 +03:00
d6a5041c3d Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 16:38:23 +03:00
facf0a01cf Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json" 2021-05-21 16:37:46 +03:00
8e889049c2 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 15:03:19 +03:00
14214f2ad8 Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" 2021-05-21 15:00:30 +03:00
f825c6eabd Web: Resolved NotFoundKeysTest issues (OkButton, LoadingLicenseSuccess, LoadingLicenseError, OrganizationName) 2021-05-21 14:58:00 +03:00
5afe35f58f Web: Removed useless translations 2021-05-21 14:24:16 +03:00
53419df9d1 Web: Removed useless translations "ProjectsUserCapabilityCreate", "ProjectsUserCapabilityForm", "ProjectsUserCapabilityTrack", "ProjectsUserCapabilityView" 2021-05-21 14:11:21 +03:00
989f74af52 Web: Removed useless translations 2021-05-21 13:36:02 +03:00
cfbb6a3ac6 Web: Fix translation key select 2021-05-21 13:35:30 +03:00
50efa8f384 Web: Moved translationKeys "MeLabel", "DefaultOptionLabel" and "AuthorMe" to "/static/locales/{lng}/Common.json" 2021-05-21 11:16:54 +03:00
bebc5ce03a Web: Moved translationKey "Documents" to "/static/locales/{lng}/Common.json" 2021-05-21 11:12:03 +03:00
eb7f493304 Web: Moved translationKeys "RequiredField" and "FullAccess" to "/static/locales/{lng}/Common.json" 2021-05-21 11:05:37 +03:00
cc2bb50862 Web: Resolved NotFoundKeysTest issues 2021-05-21 10:31:32 +03:00
Alexey Kostenko
7d440ff861 Web: Client: Fixed number of administrators on access rights page 2021-05-21 10:31:00 +03:00
Artem Tarasov
b9d7afb332 Web: Client: Settings: fixed selected tree node style 2021-05-21 01:16:22 +03:00
Alexey Kostenko
e16ca1677a Web: Client: Added loading effect, if request sending more 0.1s 2021-05-20 19:12:50 +03:00
Artem Tarasov
c6fa305b30 Web: Client: NavMenu: fixed postition version-box 2021-05-20 18:38:50 +03:00
354841442e Web: Editor: Fixed shell name 2021-05-20 14:21:26 +03:00
af2f24e4ac Merge branch 'develop' into feature/translations 2021-05-20 13:11:13 +03:00
Alexey Kostenko
8702a8827e Web: Client: Style fix ( Displaying long names in row and aside panel ) 2021-05-20 12:36:13 +03:00
c2a3d1efee Web: fixed mobile page swipe 2021-05-20 12:08:07 +03:00
fc822e5ad5 Web: Fix setModuleInfo usage 2021-05-20 11:27:50 +03:00
Alexey Kostenko
fc813eca1f Web: Client: Fixed help info position, removed unnecessary imports 2021-05-20 10:04:36 +03:00
c7ab1ed8a8 Web: Client: fixed styles 2021-05-20 08:17:20 +03:00
87baab93fd Web: Client: added urls on authenticator app 2021-05-20 06:38:09 +03:00
b8ef6150ab Web: Client: added error message 2021-05-20 05:22:36 +03:00
eccf52eba1 Web: Client: added button loader 2021-05-20 05:14:22 +03:00
9ebc5dada7 Web: Client: fixed styles 2021-05-20 04:51:18 +03:00
1274230c30 Web: Client: fixed styles 2021-05-20 04:49:15 +03:00
1ec0cb320b Web: Client: fixed styles 2021-05-20 04:40:21 +03:00
cebb38491e Web: Client: added loader 2021-05-20 04:27:25 +03:00
Artem Tarasov
d17887eabc Web: Client: NavMenu: fixed appearance of the cursor when hovering over profile icon 2021-05-20 01:48:06 +03:00
0f1ccb86bb Web: Client: deleted console, unused imports 2021-05-20 01:16:40 +03:00
ab1e14f503 Web: Client: fixed show/hide save button 2021-05-20 01:09:04 +03:00
Artem Tarasov
5996b3f74f Merge branch 'develop' into bugfix/fixed-styles 2021-05-20 01:00:36 +03:00
Artem Tarasov
80a09fdb31 Web: Client: NavMenu: fixed position version-box when change orientation or window size 2021-05-20 00:57:11 +03:00
4e57f2a47f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-20 00:47:45 +03:00
70de9e483c Web: Client: added loader 2021-05-19 19:30:41 +03:00
8d35cebc25 Web: Client: fixed show button 2021-05-19 18:29:49 +03:00
e5395c48d7 Web: Client: fixed save settings 2021-05-19 18:23:30 +03:00
692c60a444 Web: Client: login with code and cookie 2021-05-19 18:23:09 +03:00
Alexey Kostenko
f25eb00494 Merge branch 'develop' into feature/access-rights-admins 2021-05-19 18:05:19 +03:00