Commit Graph

2224 Commits

Author SHA1 Message Date
8674260bcb Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
#	web/ASC.Web.Client/tests/action_tests.js
2022-04-14 14:42:35 +03:00
d3dc0ec7b5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into bugfix/security-settings 2022-04-14 13:25:29 +03:00
fbb04ea80f Web: Common: TfaStore: delete useless 2022-04-14 12:41:24 +03:00
720703cbab Web: Common: fixed filter loader for mobile devices 2022-04-14 11:01:00 +03:00
fbe7f11f2b Web: Components: SaveCancelButtons: add isSaving prop 2022-04-13 15:03:59 +03:00
27af58022d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security 2022-04-11 17:10:12 +03:00
5dd5e22ba5 Web: Common: fix ipRestrictions 2022-04-11 17:05:55 +03:00
361e22f5af Web: Components: fixed heading styles for dark theme 2022-04-11 13:15:36 +03:00
f3a144327a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security 2022-04-11 12:09:59 +03:00
002a432b4d Web: fixed info-panel icon 2022-04-11 11:11:44 +03:00
952996f534 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-10 20:08:22 +03:00
a2995f37e6 Web:Common:Added article loader. 2022-04-10 18:23:21 +03:00
3f70481d3a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
#	packages/asc-web-common/store/AuthStore.js
2022-04-08 16:51:26 +03:00
21489279b4 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
2022-04-08 16:42:11 +03:00
dcb6e9b4a7 Web: Components: SaveCancelButtons: fix width 2022-04-08 16:32:33 +03:00
31dadfd140 Web: removed unused code 2022-04-08 15:45:08 +03:00
d9e991327c Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-08 15:02:03 +03:00
5a6badff68 Web: Components: Ipad: fixed arrow icon size for table header 2022-04-08 14:48:02 +03:00
c3be1ec82d Web: Components: Ipad: fixed search-input height 2022-04-08 14:46:42 +03:00
Timofey Boyko
b232108ff6 Web:Components:Avatar: fix error when source is undefined 2022-04-08 13:32:01 +03:00
231395fd05 Web: Common: delete useless 2022-04-08 13:18:30 +03:00
4a3325b988 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-08 12:24:25 +03:00
6d0f4fb37d Web: Common: delete useless 2022-04-08 12:24:14 +03:00
Timofey Boyko
2096b8b782 Web:Common:Components: fix position context-menu-button for navigation 2022-04-07 17:59:03 +03:00
Timofey Boyko
7bc5c357c8 Web:Common:Components: fix navigation layouts 2022-04-07 17:28:18 +03:00
Timofey Boyko
2f218e6de2 Web:Common:Components: remove fixed section header width and fix it for all device types 2022-04-07 17:27:48 +03:00
b7d45c2e66 Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security 2022-04-07 17:24:39 +03:00
b7344594ee Web: Components: Submenu: delete paddings 2022-04-07 12:46:26 +03:00
2962c0ca38 Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security 2022-04-07 04:10:15 +03:00
c6b81c6e94 Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail 2022-04-06 21:32:36 +03:00
aa91c6389c Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js
2022-04-06 20:36:36 +03:00
f6926ac460 Web: Components: Table: fixed columns resize 2022-04-06 15:45:58 +03:00
3bf51c882b Web: Components: fixed table resize 2022-04-06 14:34:00 +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
12c67953e5 Web: Common: SettingsStore: add setMailDomainSettings 2022-04-05 15:35:40 +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
b1dc7087c2 Web: Components: Themes: add icon fill 2022-04-05 13:28:44 +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
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
b171994c94 Web:Components:TableContainer: remove disabled color for group menu item of table group menu 2022-04-05 10:45:55 +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
aea75c79f9 Web: Components: Slider: fix 2022-04-04 19:31:28 +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
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