Commit Graph

1206 Commits

Author SHA1 Message Date
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
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
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
a682cdd3f7 Web: Client: fixed settings tree 2021-06-03 20:25:54 +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
7ce24557e0 Web: Client: fixed toast translations 2021-06-02 10:58:11 +03:00
f30b84fddf Web: Client: fixed group buttons menu 2021-05-31 13:57: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
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
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
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
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
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
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