Commit Graph

8883 Commits

Author SHA1 Message Date
95b3f789bd Web: Client: NavMenu: fix 2022-04-12 14:21:59 +03:00
a7b507bc0f Web: Client: RecoverAccess: use themes 2022-04-12 14:21:03 +03:00
ea6f80987f Web: Client: NavMenu: fix style 2022-04-12 14:15:13 +03:00
59e0e53d19 Web: Client: Settings: use SaveCancelButtons 2022-04-12 11:30:43 +03:00
c62b18b68b Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages 2022-04-12 11:28:54 +03:00
ce7ac083ca Web: Client: Settings: fix ip regex 2022-04-12 10:41:00 +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
44c2a267d4 Web: Client: Settings: fix get ip restriction enable 2022-04-11 17:07:05 +03:00
866a6f6c26 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-11 16:37:37 +03:00
fdfdf4e547 Web:Studio:Fix border width. 2022-04-11 16:10:12 +03:00
eaf365de0f Web: Client: Settings: add try/catch 2022-04-11 13:27:37 +03:00
Timofey Boyko
63c812cbf0 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-11 13:22:22 +03:00
Timofey Boyko
9c01f05de8 Web:Studio:Settings: hide article when catalog item changed 2022-04-11 13:22:04 +03:00
c33e724a3d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-11 12:28:02 +03:00
01e745f47b Web:Studio:Fix loaders styles. 2022-04-11 12:26:58 +03:00
b33fe33f18 Web: Client: Settings: fix show warning 2022-04-11 12:15:47 +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
433c684d09 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-11 12:08:50 +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
a2c1e836c0 Web:Studio:Added LoaderSubmenu. 2022-04-10 19:57:43 +03:00
34f223d67c Web:Studio:Added LoaderSectionHeader. 2022-04-10 19:24:05 +03:00
b0a64cbac7 Web: Client: Settings: fix after merge 2022-04-08 16:54:26 +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
d2ba43ce4b Web:Studio:Added setIsLoadingArticleSettings method. 2022-04-08 16:37:33 +03:00
f835484454 Web: Client: Settings: fix width 2022-04-08 16:12:34 +03:00
b2d162b630 Web: Client: Settings: use SaveCancelButtons 2022-04-08 16:01:03 +03:00
9aa95c6462 Web: Client: fix isSaving 2022-04-08 15:18:58 +03:00
136fa429b7 Web: Client: Settings: return isLoading 2022-04-08 15:01:53 +03:00
e251a58ad0 Web: Client: Settings: add button loader 2022-04-08 13:33:50 +03:00
3fc58edcb9 Web: Client: init settings outside shell 2022-04-08 13:19:50 +03:00
d04de3b4f7 Web: Client: Settings: delete console 2022-04-08 12:33:03 +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
797c71551b Web: Client: move init tfa to setupStore 2022-04-08 12:23:54 +03:00
b72d14dc98 Web: Client: Tests: add trusted mail settings change test server error 2022-04-08 12:09:12 +03:00
f9c5bc65ce Web: Client: Settings: delete useless 2022-04-07 22:04:16 +03:00
54fb5f3ab7 Web: Client: Settings: fix 2022-04-07 20:39:58 +03:00
8ccb5bd793 Web: Client: Settings add try/catch 2022-04-07 20:38:13 +03:00
851614569f Web: Client: Settings: fix header title 2022-04-07 18:33:39 +03:00
d5f3b4f0e6 Web:Studio:Added loaderCustomization, loaderCustomizationNavbar, loaderDescriptionCustomization. 2022-04-07 18:23:33 +03:00
ae8da903a8 Web: Client: Settings: fix category wrapper 2022-04-07 17:33:58 +03:00
ab0404e1dc Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages 2022-04-07 17:32:15 +03:00
c7a8ca7309 Web: Client: Settings: fix category wrapper 2022-04-07 17:27:52 +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
a97b34d144 Web: Client: Settings: delete useless 2022-04-07 16:23:33 +03:00
eeac7377be Web: Client: delete useless 2022-04-07 16:19:08 +03:00
0e4d12236e Web: Client: Settings: fix header title 2022-04-07 14:26:13 +03:00
0581bf7b49 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-07 14:21:17 +03:00
0d612a5330 Web: Client: Settings: add learn more link in tooltip 2022-04-07 14:20:20 +03:00
fae0973b4a Web: Client: fix show errors 2022-04-07 14:04:13 +03:00