Commit Graph

9617 Commits

Author SHA1 Message Date
9792fcb72f api: fix 2022-07-21 18:06:34 +03:00
4e83c68e4c Api: added themelimit 2022-07-21 18:02:32 +03:00
3bc5f3a6eb Api: added theme methods 2022-07-21 14:49:30 +03:00
1495190df7 Web:Studio:Modal save button work. 2022-07-20 23:47:14 +03:00
5b762545a4 Merge branch 'develop' into feature/settings-common 2022-07-20 14:00:11 +03:00
cccd0cfc31 Web:Studio:Added modal button functionality. 2022-07-20 13:00:13 +03:00
067e105814 Merge branch 'develop' into feature/modal-redesign 2022-07-19 16:58:02 +03:00
8648b588fa Web:Studio:Сolor palette stylization. 2022-07-18 18:48:21 +03:00
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
6fa0a14a33 Web:Studio:Сolor palette stylization. 2022-07-16 22:12:38 +03:00
57cef8663e Web:Studio:Adding HexColorPickerComponent, adding props nodeButtonsColor, nodeAccentColor, nodeHexColorPickerAccent, nodeHexColorPickerButtons in ColorSchemeDialog. 2022-07-16 17:44:48 +03:00
e2b1e48fa9 removed voip service 2022-07-15 18:46:52 +03:00
bb51d53cc4 add new keys-17 2022-07-15 15:02:07 +03:00
a478d7760b Web:Studio:Сolor palette stylization. 2022-07-15 10:22:56 +03:00
5bc309ed11 Web:Studio:Add header, selectedAccentColorAndButtonsMain props to ColorSchemeDialog. 2022-07-14 15:07:39 +03:00
3597114325 Api: fix tfaappnewapp 2022-07-13 18:41:44 +03:00
3cb56da496 Web:Studio:Сolor palette stylization. 2022-07-13 17:59:54 +03:00
bfac83d53c Web:Adding the react-colorful library. 2022-07-13 12:37:22 +03:00
4be3a1f937 Web:Studio:Adding a theme, editing a theme. 2022-07-13 12:32:28 +03:00
c9680ae830 fix tfaapp 2022-07-12 19:36:39 +03:00
536282eaf3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 17:53:37 +03:00
mushka
f99d8784f1 fixed RecoverAccess dialog 2022-07-12 17:28:13 +03:00
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
72b00ffe94 Merge branch 'develop' into feature/modal-redesign 2022-07-12 14:24:11 +03:00
mushka
45f2e63836 changed ConnectCloud dark theme and fixed ConsumerModalDialolg 2022-07-12 14:19:04 +03:00
a9d5080f5d Web: Client: Settings: disabled autofocus 2022-07-12 13:50:55 +03:00
7b19b2f730 Web: Client: Settings: SessionLifetime: fix show reminder 2022-07-12 13:41:50 +03:00
mushka
6f5b84308d fixed translation on Register dialog 2022-07-12 13:08:29 +03:00
0d0eed6d1a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-12 12:57:57 +03:00
mushka
a222f836c4 fixed ConsumerModalDialog compennt 2022-07-12 12:50:08 +03:00
mushka
96e85f9cb3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 12:34:43 +03:00
e9a15cc2a4 added [HttpGet("iprestrictions/settings")] 2022-07-12 12:20:59 +03:00
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
mushka
83cb430911 small tweaks on DebugInfo 2022-07-11 22:15:53 +03:00
mushka
96a2d4530e fixed DebugInfo styles 2022-07-11 22:11:55 +03:00
mushka
9d13e3a4c4 Merge branch 'develop' into feature/modal-redesign 2022-07-11 17:39:20 +03:00
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
mushka
2fb38338e5 fixed backdrop and Debug dialog 2022-07-11 13:30:55 +03:00
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
1f3dfb9ccc Web: Client: AdminMessage: fix save 2022-07-08 16:46:26 +03:00
f69194b034 Web: Client: TfaActivation: fix error 2022-07-08 16:22:30 +03:00
6a690fc175 Web: Client: fix confirmLinkData 2022-07-08 16:22:08 +03:00
0da612710d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-07 19:39:12 +03:00
7af929fee8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
a615053d88 Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order. 2022-07-06 18:26:25 +03:00
mushka
3fd65e887d Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-06 18:13:33 +03:00