Commit Graph

18654 Commits

Author SHA1 Message Date
92899d14df Web: Client: add settings translate 2022-04-06 17:04:49 +03:00
ca7c998e69 Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages 2022-04-06 16:54:22 +03:00
5ac990887b Web: Client: fixed ProfileActions 2022-04-06 15:56:51 +03:00
f6926ac460 Web: Components: Table: fixed columns resize 2022-04-06 15:45:58 +03:00
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
fffb843ae6 Web: Common: add ipRestriction in store 2022-04-06 14:09:26 +03:00
adad06610f Web: Common: API: fix, add getIpRestrictions 2022-04-06 14:08: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
3220199473
Merge pull request #604 from ONLYOFFICE/feature/password-strength
Feature/password strength
2022-04-05 18:04:23 +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
0a2f9caafb Merge branch 'feature/password-strength' of https://github.com/ONLYOFFICE/AppServer into feature/password-strength 2022-04-05 16:38:58 +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
5e866cf620 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength 2022-04-05 16:32:51 +03:00
e13661c109 Web: Client: Settings: use session storage 2022-04-05 16:32:41 +03:00
f04f3cdb3a Merge branch 'feature/virtual-rooms-1.2' into feature/password-strength 2022-04-05 16:28:19 +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
12c67953e5 Web: Common: SettingsStore: add setMailDomainSettings 2022-04-05 15:35:40 +03:00
5725a87887 Web: Client: Settings: use data from store 2022-04-05 14:41:16 +03:00
1627a3edf7 Web: Common: add avaliable to tfa store 2022-04-05 14:40:45 +03:00
ca4d825cf8 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-05 14:32:33 +03:00
62daba2e97 Web: Common: fix crash 2022-04-05 14:32:02 +03:00
b85c86b5cb Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-05 14:09:39 +03:00
47199aca82 Web: Client: Settings: fix dark theme 2022-04-05 13:29:02 +03:00
b1dc7087c2 Web: Components: Themes: add icon fill 2022-04-05 13:28:44 +03:00
c7edba4cad Web: Client: Settings: add redirect 2022-04-05 12:25:25 +03:00
ca8e47dbc7 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-05 12:16:51 +03:00
a150b59fd9 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-05 12:16:27 +03:00
49abfdf84a fix docxf templates 2022-04-05 12:07:46 +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
53acf12f1b Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength 2022-04-05 11:16:10 +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