Commit Graph

18762 Commits

Author SHA1 Message Date
74f4ade853 Web: Client: add settings translate 2022-04-07 17:41:24 +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
47573afb41 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-07 16:23:42 +03:00
a97b34d144 Web: Client: Settings: delete useless 2022-04-07 16:23:33 +03:00
23e5e5c5c2 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-07 16:20:27 +03:00
b29cf754e1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-07 16:20:18 +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
5c93fd9fbf Web: Client: Settings: fix 2022-04-07 12:48:18 +03:00
b7344594ee Web: Components: Submenu: delete paddings 2022-04-07 12:46:26 +03:00
a502c4ee52 IPRestrictionsRepository: fixed saving data 2022-04-07 08:41:58 +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
a44eaa9ea5 Web: Client: Settings: add admin message setting layout, logic 2022-04-07 04:03:37 +03:00
b07ebbce3b Web: Client: delete useless 2022-04-07 04:02:53 +03:00
860b87c932 Web: Common: SettingsStore: add setMessageSettings 2022-04-07 04:02:34 +03:00
e2e335ae90 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-06 22:27:44 +03:00
a68d6ffcdf Web:Studio:Added PortalRenaming to settingsTree. Refactoring Customization. 2022-04-06 22:27:25 +03:00
c6b81c6e94 Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail 2022-04-06 21:32:36 +03:00
0a28bd45d5
Merge pull request #596 from ONLYOFFICE/feature/info-panel
Feature/info-panel
2022-04-06 14:27:39 -04:00
406c07d8af Config: Restored formatting 2022-04-06 21:25:10 +03:00
b135de806f Web: Files: Fix borders on thumbnails 2022-04-06 21:16:44 +03:00
22181e08d7 Web: Files: Restore thumbnail-image cover and increased thumbnaillHeight and thumbnaillWidth for Info Panel 2022-04-06 21:08:08 +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
8252bce310 Fix Bug 54901 - Docs: Desktop. infinite loader on Linux 2022-04-06 20:26:20 +03:00
8efae2617d Web: Client: Settings: init admin message setting 2022-04-06 17:10:49 +03:00
2db86b4d71 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-06 17:08:18 +03:00
1755d03b4e Web:Studio:Styling Settings. Added locales en PortalRenamingMobile. 2022-04-06 17:07:48 +03:00
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
3bf51c882b Web: Components: fixed table resize 2022-04-06 14:34:00 +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
48240c6f77 Web:Studio:Added locales en PleaseNote, PleaseNoteDescription, PortalRenaming, PortalRenamingDescription, PortalRenamingDescriptionTooltip, PortalRenamingLabelText, PortalRenamingSettingsTooltip. Added tooltip PortalRenamingTooltip. 2022-04-06 12:37:15 +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
Eugene Kozyrev
5220e96b7e
Add elasticsearch connection check (#606) 2022-04-06 11:17:26 +03:00