Commit Graph

18851 Commits

Author SHA1 Message Date
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
50b523b862 Web: Common: SettingsStore: fix 2022-04-05 11:09:50 +03:00
Timofey Boyko
8936caf353 Web:Components:TableContainer: change background primary button to base for group menu item 2022-04-05 11:05:09 +03:00
Timofey Boyko
711fc4a279 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-05 10:46:01 +03:00
Timofey Boyko
b171994c94 Web:Components:TableContainer: remove disabled color for group menu item of table group menu 2022-04-05 10:45:55 +03:00
Timofey Boyko
88c90f25cb Web:People:Section: fix location and size group-button-menu for all device type 2022-04-05 10:35:57 +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
aea75c79f9 Web: Components: Slider: fix 2022-04-04 19:31:28 +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
Timofey Boyko
e270202bf1 Web:Common:Section: change width when section header doesnt exist 2022-04-04 18:31:54 +03:00
Timofey Boyko
4c049f9163 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 18:23:56 +03:00
Timofey Boyko
513a2c2b5e Web:Common:Section: remove fixed width depend of article 2022-04-04 18:23:01 +03:00
mushka
5a5237d927 fixed ad bar sizing with InfoPanel open & redesigned thumbnail scaling 2022-04-04 17:40:45 +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