Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-29 12:35:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,884 Commits 9 Branches 75 Tags 227 MiB
70a37b142c
Commit Graph

507 Commits

Author SHA1 Message Date
Sergey Isakov
0c62865b22 eliminate mouse edge effect 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-31 15:35:04 +03:00
asava
e149dafe4d Correct mistake with nvidia inject name 2020-03-31 03:09:53 +03:00
Sergey Isakov
35103e3126 move data when create ximage from png 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-30 23:31:34 +03:00
Sergey Isakov
6dc43d9d8e a possibility to use wchar in icon names 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-30 18:31:52 +03:00
Sergey Isakov
f7254f53e6 load icons as in xtheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-30 11:34:16 +03:00
asava
17c92d9526 Correct mistake in FileDevicePathToStr 2020-03-30 02:21:38 +03:00
Sergey Isakov
941244d894 merge conflict 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-29 19:19:08 +03:00
Sergey Isakov
4a541a5469 include parseXthem to xtheme class 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-29 19:17:27 +03:00
Jief L
e734530b9b Get rid of AsciiSPrint. 2020-03-29 16:44:08 +03:00
SergeySlice
76900d6350 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-29 10:14:26 +03:00
SergeySlice
38319f70bc correct font handling 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-29 10:14:14 +03:00
Jief L
d093af9b01 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-29 09:54:31 +03:00
Jief L
2100401c4e Fix include in screen.h & .cpp 2020-03-29 09:54:13 +03:00
Sergey Isakov
e59f205afc some comments around vector theme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-29 08:42:33 +03:00
SergeySlice
cf61a01b03 parse svg xtheme, not verified 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-28 21:34:23 +03:00
Jief L
651f7a02c6 Get rid of Print() calls. 2020-03-28 18:14:18 +03:00
jief
020fe5a2f0 Do not use Print() anymore. 2020-03-28 09:36:07 +03:00
SergeySlice
ace46a5646 correct more variables 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-27 22:47:06 +03:00
Sergey Isakov
8f2c4b5efd separate data in global config 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-27 19:50:17 +03:00
Sergey Isakov
b74b57b7dd use local cycle index 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-27 10:46:04 +03:00
Sergey Isakov
381487d324 rewrite graphics menu style 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-27 08:54:41 +03:00
Sergey Isakov
b58bcf7270 more text procedures 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-26 23:32:31 +03:00
Sergey Isakov
a65aa874a2 move types declarations 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-26 20:00:53 +03:00
Sergey Isakov
9b85ac2a5b merge 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-26 17:25:49 +03:00
Sergey Isakov
1abcd07489 apply theme settings to xtheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-26 17:24:20 +03:00
Jief L
ee6124bd10 Bye bye PoolPrintFloat. 2020-03-26 15:59:20 +03:00
Jief L
e8fd94bb8f Switch to new printf format for DebugLog. 2020-03-25 21:32:44 +03:00
Sergey Isakov
4b1c81b7f9 repair scroll 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-25 20:49:01 +03:00
Sergey Isakov
91ab997f5f xtheme support is mostly working 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-24 18:17:12 +03:00
Sergey Isakov
446b3cc6f6 revert build_rule 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-24 07:36:39 +03:00
Sergey Isakov
a3f3053c30 rewrite render text 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-23 22:10:16 +03:00
Sergey Isakov
8b8b8452b6 fix compilation 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-23 19:57:09 +03:00
Sergey Isakov
d7e93a96e5 adopt DrawMainMenu to XTheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-23 17:51:20 +03:00
Sergey Isakov
ddba966e94 advance menu codes for use xtheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-22 13:48:13 +03:00
Sergey Isakov
13667ae8f8 current changes moving to xtheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-21 22:52:28 +03:00
Jief L
14cdfe29c7 MemLogf and MemLogfVA. Not used yet in Clover. 2020-03-21 16:12:26 +03:00
Sergey Isakov
38d061d970 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-21 10:34:40 +03:00
Sergey Isakov
9ec0c457f5 some advance in xtheme support 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-21 10:34:28 +03:00
asava
932b218617 strip line endings from .VolumeLabel.txt 2020-03-21 09:02:48 +02:00
Sergey Isakov
f1d136e013 make scrolls for xtheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-20 20:48:19 +03:00
jief
255c331069 Fix compilation. 2020-03-18 09:39:11 +03:00
SergeySlice
5ed385d3fa introduce loadImage 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-17 22:43:58 +03:00
Sergey Isakov
0eb9528089 some screen operations for xtheme 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-17 07:25:38 +03:00
SergeySlice
81f2b91b15 clear screen in xtheme 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-16 22:47:02 +03:00
Sergey Isakov
02db12d8c3 fill theme by embedded images 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-16 14:15:25 +03:00
Sergey Isakov
6236f85a79 avoid memset generation 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-16 10:31:59 +03:00
SergeySlice
449fa1c6d1 fix debug-log by tluck 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-15 23:14:33 +03:00
SergeySlice
23fae194bd a step to xtheme 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-15 23:05:59 +03:00
SergeySlice
b6d3ddb28f optimize debug.log 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-15 16:42:45 +03:00
SergeySlice
9ab5a63908 support for VolumeIcon.icns 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-15 14:06:04 +03:00
jief
0484955f0b New platform Posix. Replace strlen, strcmp implementation. 2020-03-13 16:11:58 +03:00
Sergey Isakov
81286c08b1 dont double fonts in chain 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-13 15:13:08 +03:00
Sergey Isakov
07f5c88a8f fix delete fonts 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-13 11:44:45 +03:00
Jief L
a4d07ef335 Even better : a AddMenuInfo_f that takes printf like vararg. That avoid 
the allocation of a temporary XStringW !
 2020-03-12 21:23:32 +03:00
Jief L
d1a66122d3 Start to switch UTF16 litteral to utf8. 2020-03-12 20:45:28 +03:00
Sergey Isakov
2e1ad593df template for theme class 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-12 12:47:59 +03:00
Sergey Isakov
8d75c1909e update about menu 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-12 12:09:33 +03:00
jief
8a7950d99a Allow NULL title in NewEntry_. 2020-03-11 19:41:20 +03:00
jief
51711c1004 Disable assign & ctor with char* and wchar_t* parameter. 2020-03-10 19:50:55 +03:00
Sergey Isakov
24dec8435c fix svg fonts handling 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-10 17:05:39 +03:00
Sergey Isakov
48c89ce4d8 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-10 16:00:09 +03:00
Sergey Isakov
d8dfe555d2 separate fonts in fontChain 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-10 16:00:02 +03:00
jief
7256a868e5 REFIT_ABSTRACT_MENU_ENTRY.Title to XStringW 2020-03-10 14:51:04 +03:00
jief
a33bcb45d3 Switch struct EG_RECT to a class. 
Define basic operators.
 2020-03-10 13:27:05 +03:00
jief
41c49267a5 Clean the menu item hierarchy. 2020-03-10 12:45:17 +03:00
Sergey Isakov
956009f8ea files for qemu 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-10 07:32:08 +03:00
jief
1cb7b4e69e Few cleaning in XImage. XPointer improvement. 
Renamed some method in XArray XObjArray and XStringW.
 2020-03-09 04:12:24 +03:00
Sergey Isakov
c5f8b7df7b update russian localization 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-08 08:09:20 +03:00
Sergey Isakov
aea5deed32 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-06 18:30:12 +03:00
Sergey Isakov
328ede88f0 update About menu 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-06 18:30:07 +03:00
jief
564a3ca06c Make XPointer a shared instance. Fixed some unallocated memory with 
XArray.
 2020-03-06 10:55:52 +03:00
Sergey Isakov
b5dc9e1b7f testing mouse 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-05 21:23:21 +03:00
Sergey Isakov
797b5638d6 exclude old pointer 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-05 18:58:08 +03:00
Sergey Isakov
b735290ad2 some cleanup 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-05 16:59:17 +03:00
jief
75f33a759b NULL check added. 2020-03-05 10:37:50 +03:00
jief
640da74dd2 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-05 09:44:12 +03:00
jief
f8bf956a39 Check pointer before using it. 2020-03-05 09:42:50 +03:00
SergeySlice
69a65db69b some security checks 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
 2020-03-05 06:37:21 +03:00
jief
c6a59f85f9 Caught few access to address 0 2020-03-05 00:54:59 +03:00
jief
d549733729 A bit of debug code to keep. 2020-03-04 22:19:44 +03:00
jief
6417348844 Fix bad object allocation, remove some REFIT_MENU_SCREEN ctors. 2020-03-04 18:27:41 +03:00
Sergey Isakov
11bf50dc3a eliminate VS2017 warnings 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-04 12:50:43 +03:00
jief
4bec5cab80 Use new instead of Allocate for objects. 2020-03-04 09:21:43 +03:00
Sergey Isakov
ab6d11f473 fix InputDialog with style function 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-04 06:40:49 +03:00
Sergey Isakov
4e63e897cb auto merge 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-03 23:55:37 +03:00
Sergey Isakov
c1f6e8137a refactoring menu entries 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-03 23:44:07 +03:00
jief
fd327e2b1f Fix unresolved external. 2020-03-03 23:18:21 +03:00
jief
fc2f226e8d Resolve conflicts. Compile, but unresolved external. 2020-03-03 17:43:23 +03:00
Sergey Isakov
b3e48e0547 merge conflicts 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-03 17:21:48 +03:00
Sergey Isakov
8ff35c6295 improved XPoitner and XImage, menu advance 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-03 17:17:39 +03:00
jief
99c79d0f94 Using pointer-to-member. 2020-03-03 16:52:23 +03:00
jief
ab391cd1cc 2 details that didn't compile. 2020-03-03 14:41:00 +03:00
Sergey Isakov
24e779c6f8 refactoring menu 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-03 12:45:07 +03:00
jief
416fb4aa77 Use ptr for IN parameter. Use ref in method body. 2020-03-03 00:04:09 +03:00
Sergey Isakov
2021c9b51d use &Screen instead of *Screen 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-02 22:54:19 +03:00
Sergey Isakov
c0df0f8787 some update for using pointer and scroll 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-02 22:00:01 +03:00
Sergey Isakov
dcdd8cc091 avoid memset generation 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-02 16:46:30 +03:00
Sergey Isakov
1acd6a43b4 first implementation of XPointer class 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-02 15:00:24 +03:00
Sergey Isakov
a260cbad92 some remarks 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-03-01 11:46:12 +03:00
jief
2de3b84957 Moved DriveImage and BadgeImage down the hierarchy because only loader 
use them.
 2020-02-29 15:56:36 +03:00
jief
dec25e954e Start refactoring includes. Make gen-config compile. 2020-02-29 10:30:21 +03:00
jief
e05286e4a4 Big big refactoring of REFIT_MENU structs. They are now objects. 
There is some cleaning to do
in the hierarchy of REFIT_ABSTRACT_MENU_ENTRY.
 2020-02-28 23:28:33 +03:00
Sergey Isakov
5709ec8c2c quirky but working 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-28 22:41:03 +03:00
Sergey Isakov
bdc977d14f make genconfig happy 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-28 21:12:57 +03:00
jief
c77802d200 Refactor of "Volumes" global var as an XObjArray. 2020-02-27 17:34:29 +03:00
jief
56ca2c3e67 Import XArray and XObjArray. 
Create a basic unit test of C++ classes.
 2020-02-23 14:21:28 +03:00
jief
0d110b4b72 JIEF_DEBUG instead of CLOVER_DEBUG 2020-02-23 14:20:22 +03:00
Sergey Isakov
c35f9aa052 fix signess, optimize codes 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-23 08:53:21 +03:00
Sergey Isakov
3933f80eb2 correct sorting 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-22 17:07:46 +03:00
Jief L
8199d9b75c Remove unecessary cast. Some cleanups. 2020-02-22 00:22:30 +03:00
Jief L
82aaf09e74 VC2017 compilation 2020-02-21 12:44:15 +03:00
Jief L
c6499afa83 Fix AddListElement 
Remove non-const casts
 2020-02-21 08:29:22 +03:00
Jief L
241a55ce69 Fixing some CONST. 2020-02-21 08:22:09 +03:00
Sergey Isakov
eb26300fd6 some more fixes 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-21 06:54:01 +03:00
Sergey Isakov
127b035930 fix GCC53 compilation 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-20 19:24:30 +03:00
Sergey Isakov
5b02b51273 more type casting fixes 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-20 17:28:24 +03:00
Sergey Isakov
f8098a8336 some adoptation to VS2017 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-20 15:53:27 +03:00
Sergey Isakov
20237d492a cleanup 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-18 21:49:54 +03:00
jief
c59da4d55a Debug message to enable real time debugging. 2020-02-18 09:03:14 +03:00
jief
15c1c82a6d Fix build of clover-genconfig 2020-02-18 08:58:56 +03:00
jief
7fa464fde0 Final switch to C++ compiler 2020-02-17 23:41:09 +03:00
jief
bfc77330a8 Activate Debug on Console (temporary) 2020-02-17 12:55:09 +03:00
Sergey Isakov
60b6eb5c33 use RT instead of RS 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-16 15:00:20 +03:00
Sergey Isakov
d836611308 cpp will be only compilation mode 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-16 13:53:12 +03:00
Sergey Isakov
86cb372de2 add missing files 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-15 17:51:18 +03:00
Sergey Isakov
d2ac4d7de9 merge master and c++_globals 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-02-15 17:29:59 +03:00
jief
718c915f1f USe .VolumeLabel.txt for bottom right message. 2020-01-15 10:58:18 +03:00
vectorsigma72
12d559aef6 Log audio devices 
Parsing the boot-log will help Clover.app finding startup audio settings.
 2019-12-28 23:34:11 +01:00
jief
a79acfcd24 Fix void* cast and enum cast (prepa C++) 2019-12-27 18:09:07 +01:00
jief
2d4a9a77c5 Fix CONST warnings (prepa C++) 2019-12-27 17:12:28 +01:00
jief
5e650e92cf Add cast to return value of GetNvramVariable (prepa C++) 2019-12-27 16:10:42 +01:00
jief
9b01a6fe58 Add cast to return value of memory allocation functions (prepa c++) 2019-12-27 15:21:40 +01:00
jief
ea2408cada add CONST to parameter fmt in PoolPrint and _PoolCatPrint 2019-12-27 15:21:38 +01:00
jief
7a0295e366 Move clover boot volume info to bottom right corner. 2019-12-20 18:18:55 +01:00
Sergey Isakov
553c3c338d change string to char 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-12-20 15:35:29 +03:00
Sergey Isakov
ad0eb1988d dont show Clover boot volume if it commented out 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-12-20 14:47:02 +03:00
jief666
af35dcccbb
Merge pull request #57 from jief666/BootAndVolumeInfo 
Display Cover boot volume, Use .VolumeLabel.txt
 2019-12-18 23:45:55 +01:00
jief666
abc511efaa
Merge pull request #55 from jief666/KextLoadingVersionMode 
Rename '10.x' folder
 2019-12-17 14:18:36 +01:00
jief
35eedf476a Display CLover boot volume 
Use .VolumeLabel.txt to improve menu item label
 2019-12-16 15:28:22 +01:00
jief
ab6e5c2238 Resolve conflict. 2019-12-16 15:22:15 +01:00
Sergey Isakov
f3797c128c exclude unused variable 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-12-13 15:55:40 +03:00
jief
7ef7e4055d Remove unused var 
Rename '10.x' folder just '10' to be more consistent.
 2019-12-13 12:56:57 +01:00
Sergey
9fccb22efa
Merge pull request #52 from jief666/KextLoadingVersionMode 
Kext loading new structure
 2019-12-13 14:28:17 +03:00
jief
d1abb9167c Preserve backward compatibility 2019-12-11 14:22:21 +01:00
jief
ffb691c078 Add a 10.x folder 2019-12-11 13:52:26 +01:00
jief
2eeb066529 rename function to SetOEMPathIfExists 2019-12-11 12:42:40 +01:00
jief
43dc4fd707 Add OEM path possibilities. 2019-12-11 12:39:06 +01:00
jief
0946f0d1e8 Load kext depending on version and boot mode. 2019-12-09 11:22:15 +01:00
Sergey Isakov
6caf35b406 create library for HDA operations 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-11-27 14:16:02 +03:00
Sherlocks
32c2f6e103 Clean up Reset NVRAM 2019-11-22 22:19:43 +09:00
Sergey Isakov
6852bd3a50 dont restart automatically after F11 it can be done manually 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-11-21 14:46:21 +03:00
Florin9doi
00626a97e8 Print Nvidia Volta/Turing names in preboot.log 2019-11-11 21:54:53 +02:00
Sergey Isakov
be7ab87dca implemented patch with mask for kext, kernel and booter 2019-10-08 23:57:18 +03:00
Sergey Isakov
6a56c2951b refactoring, renaming, cleanup 2019-10-04 23:32:02 +03:00
Sergey Isakov
22934bbecf include headers into inf files 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-09-05 07:30:46 +03:00
Sergey Isakov
7a0d3948dc apply revision 5064 from sf 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-09-04 13:53:00 +03:00
Sergey Isakov
7c0aa811ec initial commit Clover sources 5061 and modules from EDK2 latest with legacy codes from UDK2018 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2019-09-03 12:58:42 +03:00