Commit Graph

85 Commits

Author SHA1 Message Date
36ce7a1b93 Web: People: fixed translations 2021-05-17 17:21:29 +03:00
5f0f262adf Web: People: get tfa backup codes 2021-05-05 14:59:58 +03:00
3c7ab3b748 Web: People: fixed after merge 2021-04-28 11:25:58 +03:00
0656725149 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
2021-04-28 11:20:32 +03:00
11eea156a5 Web: People: fixed GroupAction 2021-04-27 10:18:53 +03:00
Alexey Kostenko
a96ae77570 OAuth: Fixed crash on login page 2021-04-26 16:41:57 +03:00
0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Profile.json
#	products/ASC.People/Client/public/locales/ru/Profile.json
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/public/locales/en/Confirm.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Confirm.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-26 15:57:19 +03:00
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
4bdf5e4e55 Web: Fix fallback language apply on new language setup 2021-04-23 19:51:10 +03:00
Alexey Kostenko
c79c248b3a Web: People: OAuth buttons have been moved from the edit profile section to the profile view section 2021-04-22 16:09:56 +03:00
Alexey Kostenko
8519fe4d60 Web: Components: SocialButton style fix 2021-04-22 14:54:06 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
Alexey Kostenko
1aae2e60cf Web: Client/Login: Removed 2nd window for actions through oAuth 2021-04-21 14:48:17 +03:00
461110e1a7 Web: Fix show loaders timeout for quickly responses 2021-04-19 13:36:40 +03:00
Viktor Fomin
fb0048f998 Web: People: show count remaining codes 2021-04-13 13:03:26 +03:00
Viktor Fomin
6128702bfd Web: People: added backup codes dialog on page 2021-04-13 01:29:06 +03:00
Viktor Fomin
1f8f47693b Web: People: added reset application dialog on page 2021-04-13 00:03:10 +03:00
Viktor Fomin
800b85f5c8 Web: People: strong text 2021-04-12 23:33:41 +03:00
Viktor Fomin
2d7214334f Web: People: added login settings 2021-04-12 19:11:09 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
6f3c3d6c2a Web: People: Fixed facebook social button style 2021-04-12 10:36:37 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
Artem Tarasov
3ee7541e54 Web: Components/People: fixed translation in PasswordInput 2021-04-07 14:41:46 +03:00
Vladislav Makhov
33c3905c65 web: people: fix goBackAndReset, when creating user 2021-04-07 12:34:37 +03:00
TatianaLopaeva
375ce74464 Web:People: Fixed scroll to top when switching a group. 2021-04-07 11:34:05 +03:00
Vladislav Makhov
fbf2c27910 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 14:18:26 +03:00
Vladislav Makhov
065115fffd web: people: fix avatar changes 2021-04-06 14:18:15 +03:00
TatianaLopaeva
3a35fb09fd Web: People: Profile: Fixed the problem of displaying a different avatar when editing profile. 2021-04-06 14:11:02 +03:00
Vladislav Makhov
2c7c5532eb web: people: fix tracking of avatar changes 2021-04-06 14:03:14 +03:00
Artem Tarasov
056c288fae Web: People: fixed reset filter after switching from profile 2021-04-05 18:06:48 +03:00
Artem Tarasov
9d7f6265e7 Web: People: fixed manager name for a group without a manager 2021-04-05 16:35:38 +03:00
Vladislav Makhov
bf6cb4b134 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:09:34 +03:00
Vladislav Makhov
cf85e950ff web: people: fix onGroupClick 2021-04-05 16:09:21 +03:00
2655f0c62d Web: fixed Trans 2021-04-05 15:35:50 +03:00
Alexey Kostenko
866a1bfa68 Web: People: Removed unused method 2021-04-05 13:36:04 +03:00
Alexey Kostenko
e333e7e82d Web: People: Clear interval if getter token window is closed (connecting providers) 2021-04-04 16:53:27 +03:00
Alexey Kostenko
c4aaa3618f Web: People: Show login settings only on your account 2021-04-02 11:10:26 +03:00
Alexey Kostenko
e4d11c8246 Web: People: Updating to the state of the connection to providers. Added notifications 2021-03-31 16:38:52 +03:00
Alexey Kostenko
e66d9e52d9 Web: People: Removed unnecessary method getSerializedProfile 2021-03-30 15:08:01 +03:00
Alexey Kostenko
0f5e5cce3f Web: Components/People/Login: Fixed warning ("React does not recognize prop") 2021-03-30 11:37:21 +03:00
Alexey Kostenko
7ff66e894a Web: Login: Render only available providers for login 2021-03-26 17:19:26 +03:00
Alexey Kostenko
6fadc94b71 Web: Components/People: Fixed social-button styles 2021-03-25 18:06:48 +03:00
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00
Alexey Kostenko
894449d95c Web: People: Unlink account from provider 2021-03-24 16:51:16 +03:00
Alexey Kostenko
17956f05c0 Web: People: Linking with providers 2021-03-24 14:20:59 +03:00
Alexey Kostenko
e1df253b22 Web: People/Components: Added login settings buttons to edit profile page, social button - style fix 2021-03-23 18:29:29 +03:00
TatianaLopaeva
7ef1429cb7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 10:40:23 +03:00
TatianaLopaeva
cc707204d9 Web: Removed jumps of article when the page is loading. 2021-03-23 10:39:37 +03:00