Commit Graph

2528 Commits

Author SHA1 Message Date
fa397a1511 Web: Client: Settings: ipSecurity add layout and logic 2022-04-06 14:13:15 +03:00
ae3aff5576 Web: Client: delete useless 2022-04-06 14:09:52 +03:00
d6e317e7d3 Web: Client: Settings: init ip security setting 2022-04-06 12:35:38 +03:00
08d7647bbe Web: Client: add settings translates 2022-04-06 12:24:35 +03:00
2c4c61a341 Web: Client: Settings: add id 2022-04-06 12:02:29 +03:00
33001bf8f7 Web: Client: Tests: add trusted mail settings change tests 2022-04-06 12:01:47 +03:00
1cb67aacdb Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-06 11:32:46 +03:00
7ec70e37fa Web: Client: Settings: show error 2022-04-06 11:32:29 +03:00
ef7a1be29d Web: Client: Settings: fix session logic 2022-04-06 10:58:35 +03:00
5e890f81c9 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-05 23:05:08 +03:00
1137946577 Web:Studio:Added functionality to the PortalRenaming component. 2022-04-05 23:04:50 +03:00
fa9b365211 Web:Studio:Added the PORTAL_RENAMING route. 2022-04-05 23:03:42 +03:00
7deb741978 Web:Studio:Added SuccessfullySavePortalNameMessage locales en. 2022-04-05 23:02:45 +03:00
4960c16805 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-05 18:05:12 +03:00
3b7c80b7b8 Web: Client: Settings: fix 2022-04-05 17:59:50 +03:00
b97ad7459a Web: Client: Settings: fix btn size 2022-04-05 17:27:48 +03:00
c79f294bb3 Web: Client: Settings: fix 2022-04-05 17:21:04 +03:00
adeff36777 Web: Client: Settings: use session storage for tfa 2022-04-05 16:42:44 +03:00
6f28c9d187 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-05 16:33:20 +03:00
e13661c109 Web: Client: Settings: use session storage 2022-04-05 16:32:41 +03:00
d98ba7574c Web: Client: Settings: use session storage 2022-04-05 16:13:54 +03:00
ccbd8c88f5 Web: Client: Settings: use settings store 2022-04-05 15:35:59 +03:00
5725a87887 Web: Client: Settings: use data from store 2022-04-05 14:41:16 +03:00
47199aca82 Web: Client: Settings: fix dark theme 2022-04-05 13:29:02 +03:00
c7edba4cad Web: Client: Settings: add redirect 2022-04-05 12:25:25 +03:00
9a1ba0a597 Web: Client: Settings: fix learn more 2022-04-05 11:59:28 +03:00
7645d0bb1c Web: Client: Settings: delete useless after merge 2022-04-05 11:20:28 +03:00
331ab31e02 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
2022-04-05 11:18:28 +03:00
5917b4dcb9 Web: Client: Settings: add learn more wrapper 2022-04-05 11:15:58 +03:00
f818a364aa Web: Client: Settings: get settings from store 2022-04-05 11:10:07 +03:00
6fef466d23 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength 2022-04-04 22:12:05 +03:00
5b825dc6ac
Merge pull request #579 from ONLYOFFICE/feature/add-units
add new lines
2022-04-04 19:38:45 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
9ce0f807c5 Web: Client: Settings: show loader 2022-04-04 19:31:43 +03:00
cb2d6653a8 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 19:30:42 +03:00
17787d55ad Web: Fixed toast error for backup 2022-04-04 19:27:53 +03:00
d0d2abecea Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 19:27:44 +03:00
d7ec0e118c Web:Studio:Add PortalRenaming. 2022-04-04 19:27:24 +03:00
f70f51df64 Web: Client: Settings: fix style 2022-04-04 19:14:27 +03:00
70d41327c9 Web: Client: Settings: fix style 2022-04-04 19:09:42 +03:00
ac5c548fff Web: Fixed toastr for backup. 2022-04-04 19:03:58 +03:00
31011bdbc6 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
# Conflicts:
#	web/ASC.Web.Client/tests/action_tests.js
2022-04-04 17:12:54 +03:00
fd2f767063 Web: Client: fix mobile view size 2022-04-04 17:12:02 +03:00
f677b0e484 Web: Client: delete space 2022-04-04 17:11:44 +03:00
d866dfecfb Web: Client: fix 2022-04-04 16:59:38 +03:00
1ff94b3d0c Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 15:53:01 +03:00
3016f43fab Web:Studio:Added Welcome Page Settings mobile render test, Welcome Page Settings Restore to Default button test, Welcome Page Settings Save button test. 2022-04-04 15:52:41 +03:00
1252ccfc38 Web:Studio:Added id for TextInput and SaveCancelButtons. 2022-04-04 15:50:10 +03:00
fefad51e53 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 15:43:07 +03:00
4934edcfba Web:Fixed backup styles after merge. 2022-04-04 15:40:45 +03:00