mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,888 Commits 2 Branches 9 Tags
ba2cc578d7b9dfb618b757cc8abf0feb451ad9e8
Commit Graph

209 Commits

Author SHA1 Message Date
Stefan Seyfried
50fe384389 CFileHelpers: remove 'doCopyFlag' -- it's always true anyway 
Origin commit data
------------------
Commit: 7625d7782c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)
 2014-01-27 11:33:55 +01:00
Stefan Seyfried
133e7a8522 helpers: add a function to find an executable in $PATH 
Origin commit data
------------------
Commit: e37e425674
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 21:43:08 +01:00
Stefan Seyfried
59b18c3d00 helpers: add a function to find an executable in $PATH 
Origin commit data
------------------
Commit: 1867f687b8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 16:09:48 +01:00
Stefan Seyfried
16942ab183 Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
 2014-01-05 18:31:31 +01:00
Jacek Jendrzej
25d9e507a0 move toEpoch to helpers.cpp, use strptime 
Origin commit data
------------------
Commit: 52741fb1e4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)
 2014-01-04 20:48:13 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
936cdc41dc more char* -> std::string conversions 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 2cee6929d6
Author: martii <m4rtii@gmx.de>
Date: 2013-06-27 (Thu, 27 Jun 2013)
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
Jacek Jendrzej
cbebe671ac use mySleep in CComponentsFrmClock::initClockThread( 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: ececd844fa
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
 2013-12-15 17:40:32 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
vanhofen
ba6a667595 helpers.cpp: port safe_mkdir() from martii 
Origin commit data
------------------
Commit: 57267a28aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- helpers.cpp: port safe_mkdir() from martii
 2013-11-22 12:35:20 +01:00
vanhofen
5efc09d8dc helpers.cpp: simplify check_dir(); ported from martii 
Origin commit data
------------------
Commit: 44cddc05d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-22 (Fri, 22 Nov 2013)

Origin message was:
------------------
- helpers.cpp: simplify check_dir(); ported from martii
 2013-11-22 12:10:26 +01:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
Michael Liebmann
cb7221a3d5 Fix compiler warnings (-Wconversion) 
Origin commit data
------------------
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
 2013-10-10 01:58:37 +02:00
Michael Liebmann
2c767d14d1 src/system/helpers.cpp: Replace wrong data types in get_fs_usage() 
- Change from 'long' to 'uint64_t'
- src/Makefile.am: Add -D_FILE_OFFSET_BITS=64 to AM_CPPFLAGS


Origin commit data
------------------
Commit: 36f3579df6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
 2013-10-10 01:58:37 +02:00
Jacek Jendrzej
7588017b3d CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir 
Origin commit data
------------------
Commit: 6f07cbe3dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)

Origin message was:
------------------
CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir
 2013-10-08 10:10:10 +02:00
Stefan Seyfried
73c2c16129 system/helpers: add missing include 
Origin commit data
------------------
Commit: 0c939250c2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 20:09:54 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
Michael Liebmann
cecc09af75 helpers.cpp: Add getFileName(), getFileExt(), getNowTimeStr() 
Origin commit data
------------------
Commit: 5d77f01b5d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
 2013-08-08 14:09:47 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
Michael Liebmann
4b6eba3a10 src/system/helpers.cpp: Add getBaseName() and getPathName() 
Origin commit data
------------------
Commit: 767ff03d98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)
 2013-07-03 07:30:09 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Jacek Jendrzej
ad8f946572 CFileHelpers::copyFile - prevent possible compile error 
Origin commit data
------------------
Commit: 476b896972
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-20 (Mon, 20 May 2013)

Origin message was:
------------------
CFileHelpers::copyFile - prevent possible compile error
 2013-05-20 12:07:04 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Jacek Jendrzej
d2ddf2bdc3 src/system/helpers.cpp:-add file_size function 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 947a277a49
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
 2013-04-24 21:35:25 +02:00
Stefan Seyfried
d6d9bf4d84 my_system: cleanup and propagate exitstatus 
Origin commit data
------------------
Commit: aa411cff93
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-04-01 15:42:46 +04:00
Stefan Seyfried
05940c467e helpers: silence compiler warning 
Origin commit data
------------------
Commit: db802eb60a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 19:26:50 +01:00
Stefan Seyfried
242399690f my_system: cleanup and propagate exitstatus 
Origin commit data
------------------
Commit: e1df8ebafd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 11:38:09 +01:00
Stefan Seyfried
44d491cc7f my_system: return errno, silence trivial error message 
Origin commit data
------------------
Commit: 94cb301612
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-12 16:31:56 +04:00
Stefan Seyfried
bc4f37de5e my_system: return errno, silence trivial error message 
Origin commit data
------------------
Commit: d77e54fcd6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-09 18:08:23 +01:00
Stefan Seyfried
9c0fbe8943 helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-05 11:58:49 +01:00
Stefan Seyfried
f1812eb16d my_system/my_popen: detach the children from neutrino's terminal 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 22be19a9b0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-02 (Sat, 02 Mar 2013)
 2013-03-05 11:16:57 +01:00
Stefan Seyfried
811e75380e helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.


Origin commit data
------------------
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-03 19:18:13 +01:00
Stefan Seyfried
f0b59a7869 my_system/my_popen: detach the children from neutrino's terminal 
Origin commit data
------------------
Commit: b37a778012
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-02 (Sat, 02 Mar 2013)
 2013-03-02 20:01:24 +01:00
Stefan Seyfried
1684f2481d make the extupdate build conditional 
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure


Origin commit data
------------------
Commit: 5b72a7fe3c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
 2013-02-22 17:14:38 +01:00
Stefan Seyfried
80a87017f3 neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2013-02-21 15:47:18 +01:00
Stefan Seyfried
53365a8ae0 my_popen: close filedescriptors before exec 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 3064107b90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)
 2013-02-20 21:05:08 +01:00
Stefan Seyfried
fb54adb26a my_popen: close filedescriptors before exec 
Origin commit data
------------------
Commit: c83a35ebfc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)
 2013-02-20 15:20:55 +01:00
Stefan Seyfried
665e01cb28 Merge branch 'uncool/dvbsi++' commit 1b297bb909 
Conflicts:
	src/eitd/SIevents.cpp


Origin commit data
------------------
Commit: 7e701bfefc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)
 2013-01-29 21:27:41 +01:00
Thilo Graf
daf4a68e5e extended update: move ext_update.* to update_ext.* 
Beware the canonical order of filenames.


Origin commit data
------------------
Commit: 9939fc9197
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-14 15:31:43 +01:00
Stefan Seyfried
398f17e65a Merge branch 'uncool/dvbsi++' commit d7a2395633 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)
 2013-01-03 09:46:11 +01:00
Michael Liebmann
8f3a597f7b system/helpers.cpp: Adding value 'bsize' as a possible return value 
Origin commit data
------------------
Commit: 6e1a2dc9cd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-01 (Tue, 01 Jan 2013)

Origin message was:
------------------
* system/helpers.cpp: Adding value 'bsize' as a possible return value
 2013-01-01 15:05:21 +01:00
Stefan Seyfried
8baeccb8a1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
 2012-11-23 18:45:22 +01:00
Michael Liebmann
25278d8398 Software Update with apply the settings (Part10) 
- Blacklist added to exclude files
- Files are marked by a prefixed '-' in the settingsupdate.conf


Origin commit data
------------------
Commit: cddf86725d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-11 (Sun, 11 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part10)

- Blacklist added to exclude files
- Files are marked by a prefixed '-' in the settingsupdate.conf
 2012-11-11 08:11:49 +01:00
Stefan Seyfried
4c7a4f15cc neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 14:05:48 +01:00
Jacek Jendrzej
44a2bd7678 src/system/helpers.cpp: fix resource leak ,use new instead of malloc 
Origin commit data
------------------
Commit: a03445fe40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-26 (Fri, 26 Oct 2012)
 2012-10-26 23:16:30 +02:00
Michael Liebmann
18d3557035 Fix compiler warning 
"missing sentinel functions call" in src/system/helpers.cpp


Origin commit data
------------------
Commit: 37c4b21ac3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-21 (Sun, 21 Oct 2012)

Origin message was:
------------------
* Fix compiler warning

 "missing sentinel functions call" in src/system/helpers.cpp
 2012-10-25 01:10:35 +01:00
Michael Liebmann
a7cc09981b Add file/directory functions to src/system/helpers.cpp 
- Required for 'update with settings'


Origin commit data
------------------
Commit: 690786c37c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-21 (Sun, 21 Oct 2012)

Origin message was:
------------------
* Add file/directory functions to src/system/helpers.cpp

- Required for 'update with settings'
 2012-10-25 01:10:35 +01:00
vanhofen
3d1bca8983 system/helpers: rework get_fs_usage() 
also comment some unuses variables in src/infoviever_bb.{h,cpp}


Origin commit data
------------------
Commit: 7c01980e94
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-09-27 (Thu, 27 Sep 2012)

Origin message was:
------------------
- system/helpers: rework get_fs_usage()

also comment some unuses variables in src/infoviever_bb.{h,cpp}
 2012-09-27 12:22:33 +02:00
[CST] Focus
0397d4c20c system/helpers.cpp: fix check_dir - we use it to check for record, last change allow recording to jffs2 
Origin commit data
------------------
Commit: 108ee92618
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
 2012-09-21 18:44:47 +04:00