Commit Graph

7282 Commits

Author SHA1 Message Date
7c7d548825
Merge branch 'develop' into feature/access-rights-admins 2021-06-10 11:50:49 +03:00
e257012a9a Notify: fix 2021-06-10 11:47:58 +03:00
1d9e49b88f Web: Client: Settings: Fixed translation keys 2021-06-10 11:31:47 +03:00
fbb480671b Web: Client: fixed translates 2021-06-09 17:30:10 +03:00
a3c5eea477 Web: Client: deleted unused translations key 2021-06-09 17:16:37 +03:00
ff5ea3019b Web: Client: added select all 2021-06-09 16:42:43 +03:00
026ceec20c Web: Client: fixed 2021-06-09 16:18:06 +03:00
82fddadd6d Web: Client: fixed tooltip color 2021-06-09 04:03:18 +03:00
4fcd83ae6d Web: Client: fixed translate 2021-06-09 03:31:52 +03:00
20a1869cfd Web: Client: fixed label 2021-06-09 03:10:38 +03:00
bc46acebcc Web: Client: bringing code to common style 2021-06-09 02:57:11 +03:00
5ea562e996 Web: Client: fixed translations 2021-06-09 02:43:07 +03:00
167ca1fbb5 Web: Client: fixed loading 2021-06-09 00:39:08 +03:00
9019b36951 Web: Client: moved pages in sub-components 2021-06-09 00:33:04 +03:00
db21597f17 Web: Client: fixed access portal urls 2021-06-09 00:30:19 +03:00
3db9fde5aa Web: Client: fixed title 2021-06-09 00:25:45 +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
783bedffbb Web: Client: deleted unused image 2021-06-08 16:06:07 +03:00
d881c48b4b Web: Client: fixed translations 2021-06-08 15:20:03 +03:00
9c5a960d40 Web: Client: submit by numpad enter 2021-06-08 13:09:46 +03:00
655f250cdb Web: Client: fixed accessPortal page 2021-06-08 12:08:25 +03:00
58f7a0f285 Tfa: fix 2021-06-08 11:34:14 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
a682cdd3f7 Web: Client: fixed settings tree 2021-06-03 20:25:54 +03:00
ce35405190 Web: Client: deleted duplicate key 2021-06-03 20:25:35 +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
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
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
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
061b4e46e7 Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue) 2021-05-31 19:11:58 +03:00