vanhofen
43e72499c8
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 87c5740a3c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-26 (Thu, 26 Oct 2017)
2017-10-26 15:56:34 +02:00
vanhofen
9b1ce4d839
zapit: add missing "case DVB_T2" to getDelSys()
...
Origin commit data
------------------
Commit: 5476db5d7c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-26 (Thu, 26 Oct 2017)
Origin message was:
------------------
- zapit: add missing "case DVB_T2" to getDelSys()
2017-10-26 15:55:34 +02:00
vanhofen
af27aee505
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: ec807f6799
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-25 (Wed, 25 Oct 2017)
2017-10-25 14:09:24 +02:00
vanhofen
a170dd18d9
backup.sh: add /var/httpd
...
Origin commit data
------------------
Commit: 91ec595ba3
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-25 (Wed, 25 Oct 2017)
Origin message was:
------------------
- backup.sh: add /var/httpd
2017-10-25 14:08:50 +02:00
vanhofen
943cac66e9
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: a57a7dc44b
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-25 (Wed, 25 Oct 2017)
2017-10-25 00:31:24 +02:00
vanhofen
383857f8b8
channellist: add separator item to menu for a smoother view
...
Origin commit data
------------------
Commit: 49cd7b13a3
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-25 (Wed, 25 Oct 2017)
Origin message was:
------------------
- channellist: add separator item to menu for a smoother view
2017-10-25 00:30:32 +02:00
vanhofen
439ffc068f
update: fix osd flickering
...
Origin commit data
------------------
Commit: 6709cffc6e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-25 (Wed, 25 Oct 2017)
Origin message was:
------------------
- update: fix osd flickering
2017-10-25 00:05:16 +02:00
vanhofen
f3adf96b6e
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 3dd50dfb50
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 15:01:10 +02:00
vanhofen
a470578bba
locale: minor changes in update-locales
...
Origin commit data
------------------
Commit: 0c252a08d3
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
Origin message was:
------------------
- locale: minor changes in update-locales
2017-10-23 15:00:28 +02:00
vanhofen
bdea718755
movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby
...
Origin commit data
------------------
Commit: 5ba724d65a
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
Origin message was:
------------------
- movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby
2017-10-23 14:50:01 +02:00
vanhofen
485dd06314
update: allow online-update for AX/Mutant; add some beautiful ifdef's
...
Origin commit data
------------------
Commit: 40fdc818f9
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
Origin message was:
------------------
- update: allow online-update for AX/Mutant; add some beautiful ifdef's
2017-10-23 14:35:28 +02:00
vanhofen
127d61b46f
acinclude: align to tango's names
...
Origin commit data
------------------
Commit: e7c4694196
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
Origin message was:
------------------
- acinclude: align to tango's names
2017-10-23 13:55:35 +02:00
vanhofen
37ffcdf311
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 702f4e2e61
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 08:50:11 +02:00
vanhofen
e394fc63be
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: c4810a98b9
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 08:49:37 +02:00
vanhofen
7d5f69ba94
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 79b4837909
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 08:45:33 +02:00
Michael Liebmann
4ffa54040f
CLuaInstCurl: Add script functions
...
- encodeUri
- decodeUri
- setUriData
- Set Lua api version to 1.78
Origin commit data
------------------
Commit: 9feb8efd23
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 07:54:19 +02:00
Michael Liebmann
7588f7df73
CLuaInstCurl: Fix CurlDownload() to send POST data
...
- Set Lua api version to 1.77
Origin commit data
------------------
Commit: 100fa78952
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-10-23 (Mon, 23 Oct 2017)
2017-10-23 07:54:19 +02:00
vanhofen
e340361fd9
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 74d839af62
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-22 (Sun, 22 Oct 2017)
2017-10-22 20:35:58 +02:00
J. Krieg
43f8852aee
cables.xml: update Unitymedia BW (former Kabel BW) - rearrangement channels, October 2017
...
Origin commit data
------------------
Commit: 61990a21d9
Author: J. Krieg <bellum07@googlemail.com >
Date: 2017-10-22 (Sun, 22 Oct 2017)
2017-10-22 20:35:27 +02:00
vanhofen
f9349898cb
update: allow tgz-tarballs for update via ofgwrite
...
Origin commit data
------------------
Commit: 9088a9431d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- update: allow tgz-tarballs for update via ofgwrite
2017-10-21 16:29:48 +02:00
vanhofen
41820f1e26
yWeb: silent screenshots
...
Origin commit data
------------------
Commit: 05734bbc4b
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- yWeb: silent screenshots
2017-10-21 16:29:48 +02:00
gixxpunk
57ee10ee78
fix merge
...
Origin commit data
------------------
Commit: 311714f54b
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- fix merge
2017-10-21 15:04:00 +02:00
gixxpunk
a899930ccd
Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: e18eb56492
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-21 14:54:59 +02:00
gixxpunk
d5643e9ef8
Merge branch 'ni/mp/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: c82563efdf
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-21 14:48:02 +02:00
gixxpunk
32e3e87e2f
fix typo
...
Origin commit data
------------------
Commit: 8f1ed9e031
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- fix typo
2017-10-21 14:47:23 +02:00
gixxpunk
c9f06e9912
rename uncooloff workaround to something less idiotic
...
Origin commit data
------------------
Commit: d38cc355e0
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- rename uncooloff workaround to something less idiotic
2017-10-21 14:39:49 +02:00
gixxpunk
d08ecc0f43
drop unused code
...
Origin commit data
------------------
Commit: af440e996c
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- drop unused code
2017-10-21 13:47:26 +02:00
gixxpunk
c499254e97
Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
...
Origin commit data
------------------
Commit: 48c6731023
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
2017-10-21 10:53:55 +02:00
gixxpunk
88a674910a
fix crash on init
...
Origin commit data
------------------
Commit: 549422d431
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- fix crash on init
2017-10-21 10:51:15 +02:00
TangoCash
68fb4d8a48
modify uhd channel detection to catch channels broadcasting not in DVB specs
...
Origin commit data
------------------
Commit: 407c9c0893
Author: TangoCash <eric@loxat.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
2017-10-20 21:59:19 +02:00
vanhofen
a547340034
remove file crap; comes by mistake with 765cfdd; my fault
...
Origin commit data
------------------
Commit: 742bd3ff8c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
Origin message was:
------------------
- remove file crap; comes by mistake with 765cfdd; my fault
2017-10-20 11:27:57 +02:00
vanhofen
12904b0fae
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: d45ef31a04
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
2017-10-20 10:06:07 +02:00
vanhofen
ca0861c67f
align backup.sh to latest shellexec changes
...
Origin commit data
------------------
Commit: dbd1f1f27d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
Origin message was:
------------------
- align backup.sh to latest shellexec changes
2017-10-20 09:43:26 +02:00
vanhofen
d7ed874838
deutsch.locale: small spelling fixes
...
Origin commit data
------------------
Commit: 34f8f9bccd
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
Origin message was:
------------------
- deutsch.locale: small spelling fixes
2017-10-20 08:02:09 +02:00
TangoCash
589b8485da
modify autocreate HD _and_ UHD channels as seperate lists
...
Origin commit data
------------------
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
2017-10-20 08:02:09 +02:00
TangoCash
765cfdd570
zapit: detect uhd-channels
...
Origin commit data
------------------
Commit: 2f40a15327
Author: TangoCash <eric@loxat.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
Origin message was:
------------------
- zapit: detect uhd-channels
2017-10-20 08:02:09 +02:00
vanhofen
687a72161c
use bootlogo in gray color
...
Origin commit data
------------------
Commit: 7fac7b229c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-20 (Fri, 20 Oct 2017)
Origin message was:
------------------
- use bootlogo in gray color
2017-10-20 08:02:09 +02:00
vanhofen
a76763262e
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 1ec298224c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
2017-10-19 16:08:21 +02:00
vanhofen
c442d261af
yWeb: fix 13d189d622
...
Origin commit data
------------------
Commit: 849cb7dc0f
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- yWeb: fix 13d189d622
2017-10-19 16:06:42 +02:00
vanhofen
700e670b32
yWeb: fix 4eff70753a
...
Origin commit data
------------------
Commit: a19a08636f
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- yWeb: fix 4eff70753a
2017-10-19 16:06:42 +02:00
vanhofen
42b43c524c
add bootlogo.m2v for armbox
...
Origin commit data
------------------
Commit: 641d53101d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- add bootlogo.m2v for armbox
2017-10-19 13:13:25 +02:00
vanhofen
08b87137cc
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: ef0f0116ae
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
2017-10-19 10:24:47 +02:00
vanhofen
7be8e25298
backup.sh: add some files; sort entrys alphabetically
...
Origin commit data
------------------
Commit: 5ac127c9aa
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- backup.sh: add some files; sort entrys alphabetically
2017-10-19 10:24:04 +02:00
vanhofen
9d1691fb8d
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
configure.ac
data/locale/english.locale
src/gui/components/cc_frm_footer.cpp
src/gui/dboxinfo.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/plugins.h
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
Origin commit data
------------------
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-18 (Wed, 18 Oct 2017)
2017-10-18 09:53:55 +02:00
vanhofen
f5bea1c0cd
Revert "CComponentsPIP: use default background image as default image"
...
This reverts commit 68ea18ecbf
.
Origin commit data
------------------
Commit: 3e754c36d0
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-18 (Wed, 18 Oct 2017)
2017-10-18 09:43:09 +02:00
vanhofen
904003dede
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/icons/buttons/0.png
data/icons/buttons/1.png
data/icons/buttons/2.png
data/icons/buttons/3.png
data/icons/buttons/4.png
data/icons/buttons/5.png
data/icons/buttons/6.png
data/icons/buttons/7.png
data/icons/buttons/8.png
data/icons/buttons/9.png
data/icons/buttons/blau.png
data/icons/buttons/btn_backward.png
data/icons/buttons/btn_forward.png
data/icons/buttons/btn_pause.png
data/icons/buttons/btn_play.png
data/icons/buttons/btn_record_active.png
data/icons/buttons/btn_record_inactive.png
data/icons/buttons/btn_stop.png
data/icons/buttons/down.png
data/icons/buttons/gelb.png
data/icons/buttons/gruen.png
data/icons/buttons/help.png
data/icons/buttons/help_small.png
data/icons/buttons/home.png
data/icons/buttons/info.png
data/icons/buttons/info_small.png
data/icons/buttons/left.png
data/icons/buttons/menu.png
data/icons/buttons/menu_small.png
data/icons/buttons/mute_small.png
data/icons/buttons/mute_zap_gray.png
data/icons/buttons/mute_zap_green.png
data/icons/buttons/ok.png
data/icons/buttons/power.png
data/icons/buttons/right.png
data/icons/buttons/rot.png
data/icons/buttons/up.png
data/icons/filetypes/movie.png
data/icons/filetypes/mp3.png
data/icons/headers/audio.png
data/icons/headers/bookmarkmanager.png
data/icons/headers/colors.png
data/icons/headers/error.png
data/icons/headers/features.png
data/icons/headers/games.png
data/icons/headers/icon_blue.png
data/icons/headers/icon_green.png
data/icons/headers/icon_red.png
data/icons/headers/icon_yellow.png
data/icons/headers/information.png
data/icons/headers/keybinding.png
data/icons/headers/language.png
data/icons/headers/lcd.png
data/icons/headers/mainmenue.png
data/icons/headers/multimedia.png
data/icons/headers/network.png
data/icons/headers/personalize.png
data/icons/headers/shell.png
data/icons/headers/softupdate.png
data/icons/headers/streaming.png
data/icons/headers/timer.png
data/icons/headers/upnp.png
data/icons/headers/video.png
data/icons/movieplayer/mp_b-skip.png
data/icons/movieplayer/mp_f-skip.png
data/icons/movieplayer/mp_pause.png
data/icons/movieplayer/mp_play.png
data/icons/movieplayer/mp_play_repeat_all.png
data/icons/movieplayer/mp_play_repeat_track.png
data/icons/status/ca/biss_green.png
data/icons/status/ca/biss_white.png
data/icons/status/ca/biss_yellow.png
data/icons/status/ca/conax_green.png
data/icons/status/ca/conax_white.png
data/icons/status/ca/conax_yellow.png
data/icons/status/ca/cw_green.png
data/icons/status/ca/cw_white.png
data/icons/status/ca/cw_yellow.png
data/icons/status/ca/d_green.png
data/icons/status/ca/d_white.png
data/icons/status/ca/d_yellow.png
data/icons/status/ca/ird_green.png
data/icons/status/ca/ird_white.png
data/icons/status/ca/ird_yellow.png
data/icons/status/ca/nagra_green.png
data/icons/status/ca/nagra_white.png
data/icons/status/ca/nagra_yellow.png
data/icons/status/ca/nds_green.png
data/icons/status/ca/nds_white.png
data/icons/status/ca/nds_yellow.png
data/icons/status/ca/powervu_green.png
data/icons/status/ca/powervu_white.png
data/icons/status/ca/powervu_yellow.png
data/icons/status/ca/seca_green.png
data/icons/status/ca/seca_white.png
data/icons/status/ca/seca_yellow.png
data/icons/status/ca/via_green.png
data/icons/status/ca/via_white.png
data/icons/status/ca/via_yellow.png
data/icons/status/ca/x_green.png
data/icons/status/ca/x_white.png
data/icons/status/ca/x_yellow.png
data/icons/status/channel/16_9.png
data/icons/status/channel/16_9_gray.png
data/icons/status/channel/ca2.png
data/icons/status/channel/ca2_gray.png
data/icons/status/channel/dd.png
data/icons/status/channel/dd_avail.png
data/icons/status/channel/dd_gray.png
data/icons/status/channel/radiotextget.png
data/icons/status/channel/radiotextoff.png
data/icons/status/channel/radiotextwait.png
data/icons/status/channel/res_000.png
data/icons/status/channel/res_1080.png
data/icons/status/channel/res_1280.png
data/icons/status/channel/res_1440.png
data/icons/status/channel/res_1920.png
data/icons/status/channel/res_288.png
data/icons/status/channel/res_352.png
data/icons/status/channel/res_382.png
data/icons/status/channel/res_480.png
data/icons/status/channel/res_528.png
data/icons/status/channel/res_544.png
data/icons/status/channel/res_576.png
data/icons/status/channel/res_704.png
data/icons/status/channel/res_720.png
data/icons/status/channel/res_hd.png
data/icons/status/channel/res_sd.png
data/icons/status/channel/subt.png
data/icons/status/channel/subt_gray.png
data/icons/status/channel/tuner_1.png
data/icons/status/channel/tuner_2.png
data/icons/status/channel/tuner_3.png
data/icons/status/channel/tuner_4.png
data/icons/status/channel/vtxt.png
data/icons/status/channel/vtxt_gray.png
data/icons/status/various/ats.png
data/icons/status/various/ats_gray.png
data/icons/status/various/ca.png
data/icons/status/various/lock.png
data/icons/status/various/mounted.png
data/icons/status/various/mute.png
data/icons/status/various/not_mounted.png
data/icons/status/various/pip.png
data/icons/status/various/rec_event_marker.png
data/icons/status/various/rec_gray.png
data/icons/status/various/zap.png
data/locale/Makefile.am
data/locale/english.locale
data/pictures/backgrounds/1280x720/start.jpg
src/driver/fb_accel_sti.cpp
src/gui/Makefile.am
src/gui/dboxinfo.cpp
src/gui/infoviewer_bb.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/system/settings.cpp
src/system/settings.h
Origin commit data
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-18 (Wed, 18 Oct 2017)
2017-10-18 09:41:46 +02:00
vanhofen
57e1571833
scripts: install restore_flash.sh on armbox
...
Origin commit data
------------------
Commit: 4d8f898aef
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-17 (Tue, 17 Oct 2017)
Origin message was:
------------------
- scripts: install restore_flash.sh on armbox
2017-10-17 23:03:48 +02:00
Thilo Graf
2ab178ac1d
update version to 3.6.0
...
Prepared for multiplatform builds
Origin commit data
------------------
Commit: d7922af575
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-17 (Tue, 17 Oct 2017)
2017-10-17 20:45:00 +02:00
Thilo Graf
fcd9d06d45
Merge branch 'pu/mp' into 'master'
...
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-17 (Tue, 17 Oct 2017)
2017-10-17 20:38:58 +02:00
Thilo Graf
04249e850b
CUpnpBrowserGui: fix button arrangement
...
defined label width parameter was too large
Origin commit data
------------------
Commit: acf9cdfea8
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-17 20:03:10 +02:00