Commit Graph

4643 Commits

Author SHA1 Message Date
Kirill Lipatov (Leency)
adea6f05e9 WebView 3.0 Gold: IMG support!
No page blinking on scroll, proper alpha-channel blend (PNG 32bpp), local images support, base64 images support* (only small ones yet). Need code refactoring.

git-svn-id: svn://kolibrios.org@8396 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 20:52:56 +00:00
11e69b4021 libimg: export img.resize_data
git-svn-id: svn://kolibrios.org@8395 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 18:07:49 +00:00
201cf02d85 libimg: transparency fixes.
img.convert doesn't make opaque pixels transparent.
gif decoder considers palette pixels opaque.

git-svn-id: svn://kolibrios.org@8394 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 17:22:19 +00:00
maxcodehack
751768c3c2 Fix '-v' option
git-svn-id: svn://kolibrios.org@8393 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 14:33:14 +00:00
Kirill Lipatov (Leency)
e52ed5b883 c-- apps: never use libio
Eolite: fixed bug that file or folder was not selected in case when it had to

git-svn-id: svn://kolibrios.org@8392 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 12:31:53 +00:00
maxcodehack
91fe30428d Fix autobuild
git-svn-id: svn://kolibrios.org@8391 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 11:50:48 +00:00
maxcodehack
a2cc72148f Fix autobuild
git-svn-id: svn://kolibrios.org@8390 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 11:48:41 +00:00
Kirill Lipatov (Leency)
adf7624efe avoid using libio in img.load()
git-svn-id: svn://kolibrios.org@8389 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 11:48:29 +00:00
maxcodehack
1469a8e53d Fix autobuild
git-svn-id: svn://kolibrios.org@8388 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 11:47:17 +00:00
maxcodehack
9df944e105 Add tte to autobuild
git-svn-id: svn://kolibrios.org@8387 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 11:46:08 +00:00
maxcodehack
5689be824b Fix -O2 bug in TTE
git-svn-id: svn://kolibrios.org@8386 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 11:41:03 +00:00
maxcodehack
4d1d99f255 Add GCC to tte makefile
git-svn-id: svn://kolibrios.org@8385 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 09:09:28 +00:00
Kirill Lipatov (Leency)
9d28bd0e9d decrease c-- app size
git-svn-id: svn://kolibrios.org@8383 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 01:21:31 +00:00
Kirill Lipatov (Leency)
afa42a24be fixed memory leak
git-svn-id: svn://kolibrios.org@8382 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 00:48:13 +00:00
Kirill Lipatov (Leency)
82dc2376da CMM APPS: use img_file_load (at least mblocks -1 sector)
git-svn-id: svn://kolibrios.org@8381 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-13 00:32:34 +00:00
superturbocat2001
99103794f2 - Added simple function "getopt" in stdlib (tcc)
git-svn-id: svn://kolibrios.org@8380 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-12 20:09:30 +00:00
maxcodehack
fc647254c0 Fix autobuild
git-svn-id: svn://kolibrios.org@8379 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-12 16:51:50 +00:00
maxcodehack
e6e99fe316 Fridge: code refactoring
git-svn-id: svn://kolibrios.org@8378 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-12 16:49:35 +00:00
superturbocat2001
cfd4d26cef - Added definitions for clipboard functions.
- Added DATA macro for convenient memory access by offset.
- Removed kos32sys1beta.h since it is not used anywhere
(applicable to ktcc)

git-svn-id: svn://kolibrios.org@8374 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 21:05:55 +00:00
superturbocat2001
5fdc73661c - Fixed cursor in THashView
git-svn-id: svn://kolibrios.org@8373 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 20:34:18 +00:00
superturbocat2001
14e3d78c64 - Changed libgb assembly and added libcryptal (implementation of cryptoalgorithms from Brad Conte).
- Changed build libgb.
- Added memory.h for compatibility.

git-svn-id: svn://kolibrios.org@8367 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 17:07:49 +00:00
maxcodehack
c3410b755e Add bat script to bcc32 newlib example
git-svn-id: svn://kolibrios.org@8366 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 16:43:44 +00:00
Kirill Lipatov (Leency)
de4468272c IMG: clean up in folders, mostly in /DEMOS/ and /DEVELOP/, move examples to /DEVELOP/EXAMPLES/
asciivju: add font type switcher


git-svn-id: svn://kolibrios.org@8365 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 13:33:32 +00:00
maxcodehack
2095b13813 Add newlib example to bcc32
git-svn-id: svn://kolibrios.org@8364 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 08:41:36 +00:00
Kirill Lipatov (Leency)
5d3b2a031a libimg: img.decode now checks that length is not null
WebView: img tag: proceed data-src= if src= is empty, fix crash

git-svn-id: svn://kolibrios.org@8363 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-11 03:05:01 +00:00
Kirill Lipatov (Leency)
0507b9f3b0 netcfg: updated colors and bigger buttons size
git-svn-id: svn://kolibrios.org@8356 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-09 20:52:40 +00:00
Kirill Lipatov (Leency)
810085e9ec WebView beta 4: bugfixes
git-svn-id: svn://kolibrios.org@8355 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-09 20:26:53 +00:00
Kirill Lipatov (Leency)
7fc85872d7 dl: fix
git-svn-id: svn://kolibrios.org@8354 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-09 13:29:38 +00:00
Kirill Lipatov (Leency)
b65f6a2715 SysMon 1.35: add a space in numbers for better readability
git-svn-id: svn://kolibrios.org@8353 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-09 12:43:36 +00:00
Kirill Lipatov (Leency)
294679216a WebView: fix 2 cases of crash, no space on the link start
git-svn-id: svn://kolibrios.org@8350 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 23:32:54 +00:00
IgorA
5f41a75e27 box_lib.obj: clear code
git-svn-id: svn://kolibrios.org@8346 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 21:01:35 +00:00
superturbocat2001
bed1d7841c Changed parameters of "socketpair" function in libck (ktcc)
git-svn-id: svn://kolibrios.org@8344 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 18:36:23 +00:00
a19ce6df66 Add img.blend example, add libimg examples to autobuild
git-svn-id: svn://kolibrios.org@8342 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 17:50:26 +00:00
263f2855f2 libimg: Add and export img.blend function
git-svn-id: svn://kolibrios.org@8341 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 17:40:34 +00:00
maxcodehack
54712199cb Add KolibriOS.lib example to bcc32
git-svn-id: svn://kolibrios.org@8340 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 17:17:40 +00:00
Kirill Lipatov (Leency)
f7bbca99e7 WebView: fixed critical memory leak
git-svn-id: svn://kolibrios.org@8339 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-08 11:26:22 +00:00
superturbocat2001
4c90768ccb - network.obj loader has been moved to a separate libnetwork.a library
git-svn-id: svn://kolibrios.org@8338 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-07 23:36:57 +00:00
superturbocat2001
1094e71a7d - added network.obj loader
- added _ksys_kill_process function
in libck.a ktcc

git-svn-id: svn://kolibrios.org@8337 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-07 21:19:51 +00:00
Kirill Lipatov (Leency)
7a2c280f29 WebView 2.8 beta
git-svn-id: svn://kolibrios.org@8336 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-07 18:19:13 +00:00
maxcodehack
60c3243924 Upload GNU unRTF
git-svn-id: svn://kolibrios.org@8335 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-07 09:06:07 +00:00
Kirill Lipatov (Leency)
d644c0e2c8 Eolite, dl: fix editbox when a new text was set
git-svn-id: svn://kolibrios.org@8334 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-06 21:01:31 +00:00
Kirill Lipatov (Leency)
5c1655af07 webview: some code refactoring
git-svn-id: svn://kolibrios.org@8332 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-06 12:03:16 +00:00
Kirill Lipatov (Leency)
67d3c20b4e WebView images support (temporary is off, press F11 to enable)
git-svn-id: svn://kolibrios.org@8330 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-05 23:22:38 +00:00
superturbocat2001
18d1174514 Added a mechanism for closing the parent process
git-svn-id: svn://kolibrios.org@8328 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-05 15:50:32 +00:00
IgorA
505e8a9d21 bcc32: add example boxlib_1
git-svn-id: svn://kolibrios.org@8325 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-05 10:14:15 +00:00
maxcodehack
14860dd83d Add sound to 'fridge'
git-svn-id: svn://kolibrios.org@8324 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-05 09:20:50 +00:00
Kirill Lipatov (Leency)
dc2423748e remove codeview
git-svn-id: svn://kolibrios.org@8320 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-04 16:32:16 +00:00
Kirill Lipatov (Leency)
646af6780b WebView: proceed tags like "&nbsp" without ';' at the end
Downloader: handle "content-disposition" header to set correct filename from server renponse 

git-svn-id: svn://kolibrios.org@8319 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-04 11:58:20 +00:00
maxcodehack
5832951836 Replace binarie with autobuild ('fridge')
git-svn-id: svn://kolibrios.org@8318 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-04 07:34:01 +00:00
superturbocat2001
195c220c21 fixed socketpair() function in libck
git-svn-id: svn://kolibrios.org@8317 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-04 06:40:20 +00:00
8f1d0172f6 Add /programs/games/fridge to autobuld.
git-svn-id: svn://kolibrios.org@8316 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 17:48:03 +00:00
superturbocat2001
818c477d6f - Added functions for working with sockets in libck tcc
git-svn-id: svn://kolibrios.org@8315 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 17:27:05 +00:00
maxcodehack
bc2c4a193e Fix
git-svn-id: svn://kolibrios.org@8314 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 10:32:28 +00:00
maxcodehack
eb251004ea Fix 3
git-svn-id: svn://kolibrios.org@8313 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 10:31:14 +00:00
maxcodehack
8f0881715d Fix autobuild
git-svn-id: svn://kolibrios.org@8312 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 10:29:48 +00:00
maxcodehack
b1455049b2 Add autobuild for 'tte'
git-svn-id: svn://kolibrios.org@8311 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 10:28:29 +00:00
maxcodehack
4ecba4b552 Fix autobuild
git-svn-id: svn://kolibrios.org@8310 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 10:18:17 +00:00
maxcodehack
55d4156d47 Fix C_Layer autobuild, add 'fridge' to autouild
git-svn-id: svn://kolibrios.org@8307 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 10:01:48 +00:00
Kirill Lipatov (Leency)
78b22252c8 fix prior
git-svn-id: svn://kolibrios.org@8306 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 03:00:49 +00:00
Kirill Lipatov (Leency)
1c88038821 http, dl, webview: refactoring
git-svn-id: svn://kolibrios.org@8305 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-03 02:56:54 +00:00
Kirill Lipatov (Leency)
eebb43e620 calc: change button name sqr => sqrt
git-svn-id: svn://kolibrios.org@8304 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 19:31:18 +00:00
Kirill Lipatov (Leency)
cd00029f0e WebView: small fixes
git-svn-id: svn://kolibrios.org@8302 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 14:21:06 +00:00
maxcodehack
f05eecb7a1 Fix autobuild
git-svn-id: svn://kolibrios.org@8301 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 07:22:18 +00:00
maxcodehack
95faf15603 Fix autobuild 3
git-svn-id: svn://kolibrios.org@8299 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 07:10:29 +00:00
maxcodehack
d533c6d771 Fix autobuild 2
git-svn-id: svn://kolibrios.org@8298 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 07:09:19 +00:00
maxcodehack
66f121a2af Fix autobuild
git-svn-id: svn://kolibrios.org@8297 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 07:07:35 +00:00
maxcodehack
d83fcc8a3c Add 'fridge' autobuild
git-svn-id: svn://kolibrios.org@8296 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-02 07:02:45 +00:00
Kirill Lipatov (Leency)
a97fad65bb /system/mm: remove because user access to operating system memory won't ever be possible again
git-svn-id: svn://kolibrios.org@8293 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 17:54:00 +00:00
Kirill Lipatov (Leency)
c9cad25adc fix build
git-svn-id: svn://kolibrios.org@8292 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 17:40:55 +00:00
Kirill Lipatov (Leency)
d178e4875c WebView 2.7: distinguish files to download from pages to show, download files via HTTPS, remove duplicated function of getting absolute URL from relative
git-svn-id: svn://kolibrios.org@8291 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 17:37:47 +00:00
superturbocat2001
e303140339 Removed duplicate #define PATH_MAX
git-svn-id: svn://kolibrios.org@8290 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 16:30:24 +00:00
superturbocat2001
5451715e39 - Added "lsdir" function to libck ktcc.
- Added "fs" folder to build.bat in libck for tcc.
- Updated libck and dir_example

git-svn-id: svn://kolibrios.org@8289 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 16:19:41 +00:00
IgorA
e34d1445df update ColorDialog
git-svn-id: svn://kolibrios.org@8288 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 09:58:10 +00:00
Kirill Lipatov (Leency)
02503d625c FindNumbers: -1 IMG sector
git-svn-id: svn://kolibrios.org@8287 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 02:29:21 +00:00
Kirill Lipatov (Leency)
1bc102cf71 RDInfo move to /outdated folder as it uses deleted functions 21.7 and 21.8
git-svn-id: svn://kolibrios.org@8286 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 01:40:45 +00:00
Kirill Lipatov (Leency)
4563cb18a7 Move VMODE to ISO (as it is useless without drivers that are on ISO)
git-svn-id: svn://kolibrios.org@8285 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-12-01 01:03:36 +00:00
IgorA
a27b206a90 add example use ColorDialog
git-svn-id: svn://kolibrios.org@8283 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-30 08:33:35 +00:00
maxcodehack
3ffe214e13 Add Makefile to kos32-tcc sample programs
git-svn-id: svn://kolibrios.org@8282 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-30 07:38:09 +00:00
Kirill Lipatov (Leency)
c92932964b minor fixes
git-svn-id: svn://kolibrios.org@8281 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-30 00:55:04 +00:00
superturbocat2001
5941f0e334 - Added 4 functions to libck: getcwd, setcwd, mkdir, rmdir.
- Fixed Makefile for building "libck" under tcc. 
- Added example to new functions

git-svn-id: svn://kolibrios.org@8280 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-29 22:05:50 +00:00
Kirill Lipatov (Leency)
53ddecef5a add forgotten files
git-svn-id: svn://kolibrios.org@8279 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-29 19:10:47 +00:00
Kirill Lipatov (Leency)
894aad564d Separate Downloader from WebView into /sys/network/dl
+ Multi-threaded now!
+ Some small fixes

git-svn-id: svn://kolibrios.org@8278 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-29 19:08:52 +00:00
Kirill Lipatov (Leency)
270aed5ffa SYSMON 1.3: better UI, added Rus translation
git-svn-id: svn://kolibrios.org@8277 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-29 00:37:47 +00:00
Kirill Lipatov (Leency)
5d644b9d4f Eolite: remove folder sizes for /kolibrios (bug)
git-svn-id: svn://kolibrios.org@8276 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-28 22:36:31 +00:00
superturbocat2001
dc1e174943 Disabled static linking when building Linux version of TCC.
git-svn-id: svn://kolibrios.org@8274 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-28 20:57:58 +00:00
superturbocat2001
2f517f2ecb Fixed Makefile.kos32 in TCC (New path to ld script)
git-svn-id: svn://kolibrios.org@8273 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-28 19:43:51 +00:00
superturbocat2001
dbc1c764b1 - Added compress target to Makefile.linux32 (Uses UPX)
- Fixed TCC for linux bug: does not find library and headers as well as start.o
- Updated kos32-tcc

git-svn-id: svn://kolibrios.org@8272 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-28 19:19:06 +00:00
IgorA
712b555519 animage use ColorDialog
git-svn-id: svn://kolibrios.org@8271 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-28 17:05:52 +00:00
IgorA
2ef1505e27 t_edit: fix open null file
git-svn-id: svn://kolibrios.org@8262 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-27 14:30:47 +00:00
Kirill Lipatov (Leency)
b43350b8b9 Appearance: added sorting to the list
git-svn-id: svn://kolibrios.org@8261 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-27 13:25:36 +00:00
Kirill Lipatov (Leency)
dd84ffb5f5 Various small fixes
git-svn-id: svn://kolibrios.org@8256 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-26 23:29:40 +00:00
IgorA
4f3226cf94 heed: fix open & edit null file
git-svn-id: svn://kolibrios.org@8255 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-26 22:02:39 +00:00
Kirill Lipatov (Leency)
7057eb8fa0 tinyfrac: general refactoring, use scancodes
git-svn-id: svn://kolibrios.org@8253 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-26 02:19:28 +00:00
IgorA
fe0f60a15e life2: use open dialog, big font in caption
git-svn-id: svn://kolibrios.org@8252 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-24 15:42:12 +00:00
superturbocat2001
2e992f24ea - Added TEAtool source files
- Compressed kos32-tcc
- Changed the paths of the output files in buid_all.sh

git-svn-id: svn://kolibrios.org@8251 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-24 15:13:42 +00:00
superturbocat2001
36b26f112a - Fixed ktcc build for linux
- Added Makefile.linux32
- Added TEAtool and fixed console title
- Fixed crash of THashView

git-svn-id: svn://kolibrios.org@8250 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-24 14:40:29 +00:00
IgorA
a75d4696ea add example open dialog
git-svn-id: svn://kolibrios.org@8245 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-23 18:21:24 +00:00
Kirill Lipatov (Leency)
d1f5d03d52 Now user will never lose kolibri.lbl because it is moved to ISO/kolibrios/res/system/ folder
git-svn-id: svn://kolibrios.org@8241 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-23 16:39:52 +00:00
Kirill Lipatov (Leency)
f772c6b60a Eolite: better left panel for dark skins
git-svn-id: svn://kolibrios.org@8240 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-23 13:31:55 +00:00
IgorA
661760d504 fix rev 8236
git-svn-id: svn://kolibrios.org@8237 a494cfbc-eb01-0410-851d-a64ba20cac60
2020-11-22 13:20:56 +00:00