Commit Graph

12587 Commits

Author SHA1 Message Date
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
52cb1f3896
Merge branch 'develop' into feature/access-rights-admins 2021-06-09 15:11:38 +03:00
8d80955686 Thumbnail: fix 2021-06-09 15:04:29 +03:00
82fddadd6d Web: Client: fixed tooltip color 2021-06-09 04:03:18 +03:00
93c2f7fb07 Web: Component: added tooltipColor for help button 2021-06-09 04:02:58 +03:00
6fcddbcefa Web: Components: added color for tooltip 2021-06-09 04:02:28 +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
f72e40357b
Merge pull request #261 from ONLYOFFICE/feature/two-factor-auth
Feature/two factor auth
2021-06-08 17:46:04 +03:00
93ba9c5940 Web: People: change trans on t 2021-06-08 16:09:51 +03:00
783bedffbb Web: Client: deleted unused image 2021-06-08 16:06:07 +03:00
d9b4611517 added ResetApplication translations in Common 2021-06-08 15:30:11 +03:00
18cdf1dc95 Web: People: fixed translations 2021-06-08 15:29:44 +03:00
65936fb856 Web: People: fixed translations 2021-06-08 15:25:26 +03:00
d881c48b4b Web: Client: fixed translations 2021-06-08 15:20:03 +03:00
6a06707d18 Web: People: fixed translations 2021-06-08 15:19:49 +03:00
27e6226e66 Web: People: get backupCodes from tfa store 2021-06-08 14:19:55 +03:00
41ef020616 Web: Common: added backupCodes in tfa store 2021-06-08 14:19:36 +03:00
71564c7348 Web: People: deleted duplicate key 2021-06-08 13:35:31 +03:00
ffbbcc6ac2 Web: People: change trans on t 2021-06-08 13:34:41 +03:00
af6d7cd160 Web: People: fixed 2021-06-08 13:26:04 +03:00
9c5a960d40 Web: Client: submit by numpad enter 2021-06-08 13:09:46 +03:00
ffb5dace5d Web: People: fixed 2021-06-08 12:28:51 +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
1cbe04f044
Merge pull request #270 from ONLYOFFICE/feature/remove-unused-dep
Feature/remove unused dep
2021-06-04 15:06:47 +03:00
e8516f7b34
Merge branch 'develop' into feature/two-factor-auth 2021-06-03 20:27:57 +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
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
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
cf3e315e92
Merge pull request #269 from ONLYOFFICE/feature/translations
Feature/translations
2021-06-02 14:24:10 +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