Commit Graph

9139 Commits

Author SHA1 Message Date
Timofey Boyko
1d68ac11b2 Web:Studio:ProfileMenu: add control panel for mobile devices 2022-04-15 18:58:48 +03:00
b5b49d7bc9 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-profile-menu 2022-04-15 18:31:51 +03:00
7dbc67f0e1 Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-15 18:13:54 +03:00
d8cefc614f Web: Editor: Added icons url. 2022-04-15 17:59:39 +03:00
Timofey Boyko
8176228189 Web:Studio:NavMenu: add mobile view for profile menu 2022-04-15 16:41:01 +03:00
34ef545449 Web: Backup: Fixed buttons styles. 2022-04-15 16:07:56 +03:00
e7e34ba101 Web: Backup: Fixed styles for empty list. 2022-04-15 16:02:18 +03:00
4e0f74f839 Web: Editor: Disabled button when file name is empty. 2022-04-15 14:58:27 +03:00
Timofey Boyko
515839ae4f Web:Studio:ProfileAction: add 'key' for logount button 2022-04-15 14:38:06 +03:00
Timofey Boyko
a05408c1cc Web:Studio:NavMenu: redesign logout button 2022-04-15 14:14:55 +03:00
Timofey Boyko
2f409bfad5 Web:Studio:NavMenu: remove toggle theme from profile menu 2022-04-15 13:54:14 +03:00
Timofey Boyko
f20600c5c7 Web:Studio:NavMenu: remova top-arrow of profile menu 2022-04-15 13:49:25 +03:00
Timofey Boyko
bde27048dc Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-15 13:42:50 +03:00
e603b26caa refactoring 2022-04-15 13:27:48 +03:00
cb2580dd50 refactoring 2022-04-15 12:08:06 +03:00
ce73b308e3 Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-15 11:46:28 +03:00
989037866e Web: Files: Optimization, refactoring. 2022-04-15 10:13:23 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
26947072c6 Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
#	common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Core/CollaboratorSettings.cs
#	web/ASC.Web.Core/CustomNavigationSettings.cs
#	web/ASC.Web.Core/EmailActivationSettings.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/SpamEmailSettings.cs
#	web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/PersonalSettings.cs
#	web/ASC.Web.Core/PrivacyRoomSettings.cs
#	web/ASC.Web.Core/PromotionsSettings.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
#	web/ASC.Web.Core/StudioAdminMessageSettings.cs
#	web/ASC.Web.Core/StudioDefaultPageSettings.cs
#	web/ASC.Web.Core/StudioTrustedDomainSettings.cs
#	web/ASC.Web.Core/TariffSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
#	web/ASC.Web.Core/TipsSettings.cs
#	web/ASC.Web.Core/Users/CustomNamingPeople.cs
#	web/ASC.Web.Core/Users/UserHelpTourSettings.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
#	web/ASC.Web.Core/Utility/ColorThemesSettings.cs
#	web/ASC.Web.Core/Utility/PasswordSettings.cs
#	web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-04-14 15:21:06 +03:00
cc34c5b3c5 Web: Client: Tests: add custom scenario for tfa 2022-04-14 13:25:09 +03:00
1c8094139f Web: Client: Tests: add mock 2022-04-14 13:24:35 +03:00
d2178d4f85 Web: Client: Settings: fix tfa logic 2022-04-14 12:46:58 +03:00
2359ac34c9 Web: Client: SettingsStore: add setIsInit 2022-04-14 12:41:59 +03:00
7c93072aae Web: Files: SelectFolderDialog/SelectFileDialog: Fixed aside styles. 2022-04-14 11:18:04 +03:00
6ddeff2d51 Web: Files: SelectFolderDialog/SelectFileDialog: Fixed styles according layouts. 2022-04-14 11:03:31 +03:00
49145aa463 Web: Files: Changed titles of dialogs, added isLoading prop for tree component. 2022-04-13 16:09:37 +03:00
65df8f6bfc Web: Client: Settings: move checkWidth 2022-04-13 15:32:15 +03:00
b5845e221c Web: Client: Settings: use isSaving 2022-04-13 15:18:23 +03:00
816e25772c Web: Client: add command 2022-04-13 14:52:30 +03:00
1dcc6b035b Web: Client: Tests: fix action tests 2022-04-13 14:52:11 +03:00
6ff7c9b09d Web: Client: Tests: fix mock 2022-04-13 14:51:52 +03:00
7a9e914a55 Web: Client: Settings: fix init 2022-04-13 14:51:14 +03:00
Timofey Boyko
792bd7065f Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-13 10:22:20 +03:00
4828678e03 merge from feature/backend-refactor 2022-04-12 22:04:10 +03:00
f9720af935 Settings: EnableAdmMess 2022-04-12 21:26:32 +03:00
0bfffed690 Web: Files: Refactoring, deleted useless code. 2022-04-12 16:17:44 +03:00
8a9fbe70c6 Web: Files: Added reset of tree. 2022-04-12 13:52:23 +03:00
193c1b2c9c Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-12 12:01:25 +03:00
b31015bddd fix portalrename 2022-04-12 09:28:49 +03:00
50655ae61c added portal rename method 2022-04-11 18:19:56 +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
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
433c684d09 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-11 12:08:50 +03:00
8f623ae40a Web: Files: Fixed styles. 2022-04-11 11:20:38 +03:00
d07c5e071e Web: Files: Renamed function, refactoring. 2022-04-11 11:14:05 +03:00
38aa42fdf8 Web: Files: Refactoring, deleted useless code. 2022-04-11 10:30:23 +03:00
70ee53b5cb Web: Files: SelectFolder: Added "canCreate" prop. 2022-04-11 09:42:42 +03:00
751e2b2bd1 Web: Files: SelectFolder: Fixed styles of aside view, refactoring. 2022-04-11 09:01:18 +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
b20f4cfed1 Web: Backup: Added new translation. 2022-04-10 13:14:40 +03:00
34d4b5dbaa Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-10 12:29:24 +03:00
87e1222783 Web: Files: SelectFile: Changed logic. 2022-04-08 17:12:48 +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
9932e76cc4 Web: Refactoring, added styles. 2022-04-08 14:25:26 +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
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
f9da8e4026 iprestrictions
fix Verify
add check enable
add api method
2022-04-07 13:19:30 +03:00
5c93fd9fbf Web: Client: Settings: fix 2022-04-07 12:48:18 +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
8252bce310 Fix Bug 54901 - Docs: Desktop. infinite loader on Linux 2022-04-06 20:26:20 +03:00
3ef7ae85de Web: SelectFolder: Optimization, refactoring. 2022-04-06 18:04:43 +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
5ac990887b Web: Client: fixed ProfileActions 2022-04-06 15:56:51 +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
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
ef7a1be29d Web: Client: Settings: fix session logic 2022-04-06 10:58:35 +03:00
5e890f81c9 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-05 23:05:08 +03:00
1137946577 Web:Studio:Added functionality to the PortalRenaming component. 2022-04-05 23:04:50 +03:00
fa9b365211 Web:Studio:Added the PORTAL_RENAMING route. 2022-04-05 23:03:42 +03:00
7deb741978 Web:Studio:Added SuccessfullySavePortalNameMessage locales en. 2022-04-05 23:02:45 +03:00
4960c16805 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-05 18:05:12 +03:00
3b7c80b7b8 Web: Client: Settings: fix 2022-04-05 17:59:50 +03:00
b97ad7459a Web: Client: Settings: fix btn size 2022-04-05 17:27:48 +03:00
c79f294bb3 Web: Client: Settings: fix 2022-04-05 17:21:04 +03:00
adeff36777 Web: Client: Settings: use session storage for tfa 2022-04-05 16:42:44 +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
e13661c109 Web: Client: Settings: use session storage 2022-04-05 16:32:41 +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
5725a87887 Web: Client: Settings: use data from store 2022-04-05 14:41:16 +03:00
47199aca82 Web: Client: Settings: fix dark theme 2022-04-05 13:29:02 +03:00
c7edba4cad Web: Client: Settings: add redirect 2022-04-05 12:25:25 +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
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
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
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
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
1ff94b3d0c Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 15:53:01 +03:00
3016f43fab Web:Studio:Added Welcome Page Settings mobile render test, Welcome Page Settings Restore to Default button test, Welcome Page Settings Save button test. 2022-04-04 15:52:41 +03:00
1252ccfc38 Web:Studio:Added id for TextInput and SaveCancelButtons. 2022-04-04 15:50:10 +03:00
fefad51e53 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 15:43:07 +03:00
4934edcfba Web:Fixed backup styles after merge. 2022-04-04 15:40:45 +03:00
Timofey Boyko
d4b24c6ed7 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 15:34:52 +03:00
04907c4532 Web: Client: add missed paths 2022-04-04 15:11:09 +03:00
Timofey Boyko
6e2c8f0a13 Web:Studio:NavMenu: add avatar and change position of catalog-burger for mobile devices 2022-04-04 15:03:53 +03:00
e49cbbd0fe Web: Client: Settings: fix logic 2022-04-04 14:45:13 +03:00
Timofey Boyko
9b46a23930 Web:Studio:NavMenu: fix styles of avatar for mobile devices 2022-04-04 14:37:36 +03:00
Timofey Boyko
fc09b493ed Web:Studio:NavMenu: delete useless code from profile-actions 2022-04-04 14:36:45 +03:00
c5ccec3087 Web: Client: Settings: add logic 2022-04-04 14:28:15 +03:00
Timofey Boyko
81f4f60448 Web:Studio:NavMenu: add dark mode toggler 2022-04-04 13:30:49 +03:00
bd7ebe0238 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-04 12:35:36 +03:00
f3e75773cb Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength 2022-04-04 11:36:38 +03:00