Commit Graph

12527 Commits

Author SHA1 Message Date
gixxpunk
fbaad22a4d fix crash on init
Origin commit data
------------------
Branch: ni/coolstream
Commit: 549422d431
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix crash on init

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-21 10:51:15 +02:00
TangoCash
f036090b03 modify uhd channel detection to catch channels broadcasting not in DVB specs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 407c9c0893
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 21:59:19 +02:00
vanhofen
bf89400181 remove file crap; comes by mistake with 50865f9; my fault
Origin commit data
------------------
Branch: ni/coolstream
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 50865f9; my fault

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 11:27:57 +02:00
vanhofen
e8c6452660 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d45ef31a04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 10:06:07 +02:00
vanhofen
3eb68897cd align backup.sh to latest shellexec changes
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 09:43:26 +02:00
vanhofen
5fa04dc608 deutsch.locale: small spelling fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34f8f9bccd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- deutsch.locale: small spelling fixes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
TangoCash
0aed9206ff modify autocreate HD _and_ UHD channels as seperate lists
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
TangoCash
50865f9541 zapit: detect uhd-channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f40a15327
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- zapit: detect uhd-channels

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
vanhofen
6afebe5c63 use bootlogo in gray color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fac7b229c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- use bootlogo in gray color

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
vanhofen
bce31bfe00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ec298224c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-19 16:08:21 +02:00
vanhofen
f0ba1cc5c9 yWeb: fix e63c34b00c
Origin commit data
------------------
Branch: ni/coolstream
Commit: 849cb7dc0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- yWeb: fix e63c34b00c

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-19 16:06:42 +02:00
vanhofen
3c59111258 yWeb: fix e2e32e8427
Origin commit data
------------------
Branch: ni/coolstream
Commit: a19a08636f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- yWeb: fix e2e32e8427

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-19 16:06:42 +02:00
vanhofen
7eb456f85a add bootlogo.m2v for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 641d53101d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)

Origin message was:
------------------
- add bootlogo.m2v for armbox

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-19 13:13:25 +02:00
vanhofen
6eac8fe8d2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef0f0116ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-19 10:24:47 +02:00
vanhofen
28da3c064a backup.sh: add some files; sort entrys alphabetically
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-19 10:24:04 +02:00
vanhofen
f504430ba9 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
------------------
Branch: ni/coolstream
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:53:55 +02:00
vanhofen
d762134fb3 Revert "CComponentsPIP: use default background image as default image"
This reverts commit 2fdd1cf67d.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e754c36d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:43:09 +02:00
vanhofen
e143e0bcb0 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
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
vanhofen
65c1db32c4 scripts: install restore_flash.sh on armbox
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 23:03:48 +02:00
Thilo Graf
397ebefc67 update version to 3.6.0
Prepared for multiplatform builds


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7922af575
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)



------------------
This commit was generated by Migit
2017-10-17 20:45:00 +02:00
Thilo Graf
5f29c788a7 Merge branch 'pu/mp' into 'master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 20:38:58 +02:00
Thilo Graf
4767be5583 CUpnpBrowserGui: fix button arrangement
defined label width parameter was too large


Origin commit data
------------------
Branch: ni/coolstream
Commit: acf9cdfea8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)



------------------
This commit was generated by Migit
2017-10-17 20:03:10 +02:00
Thilo Graf
007c1d3e24 icons: add new default iconset, thx OneOfNine
Hope it's complete, please report if somthing is missing!


Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d6baa23e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)



------------------
This commit was generated by Migit
2017-10-17 20:02:54 +02:00
Thilo Graf
71d16e9142 neutrino.cpp: show logo on start up
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54750e49b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 20:02:45 +02:00
Thilo Graf
2fdd1cf67d CComponentsPIP: use default background image as default image
Origin commit data
------------------
Branch: ni/coolstream
Commit: e169a76ff9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 20:02:23 +02:00
Thilo Graf
80ee5bf0e7 data/pictures: add new default background/start image
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bfe78636c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 20:02:16 +02:00
Thilo Graf
56ec7b2dbf maintain: add version update script
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7dba5bc73c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 20:02:02 +02:00
Jacek Jendrzej
a9631a3b10 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 12:45:19 +02:00
Jacek Jendrzej
db35c38ba6 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a9186515
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
movieplayer.cpp remove free , attempting free on address which was not malloc()-ed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 12:42:32 +02:00
vanhofen
4b0a40c22e backup-script: allow free definable filename for backup tarball
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf1b3ef3ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
- backup-script: allow free definable filename for backup tarball

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-17 10:43:51 +02:00
vanhofen
f3e9e200b9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 356f0073b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-16 16:44:27 +02:00
vanhofen
aff3fea762 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17e23c2a3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-16 16:43:48 +02:00
vanhofen
e63c34b00c yWeb: enable auto-reload of screenshots
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9eb1060cbb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)

Origin message was:
------------------
- yWeb: enable auto-reload of screenshots

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-16 16:43:15 +02:00
Jacek Jendrzej
dbf6f5127d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-16 13:17:17 +02:00
vanhofen
e2e32e8427 yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
Origin commit data
------------------
Branch: ni/coolstream
Commit: e4f29657ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)

Origin message was:
------------------
- yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-16 12:05:35 +02:00
Jacek Jendrzej
3a268e12c5 Revert "- libdvbsub: add missing free() call"
This reverts commit 3da19efe98.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f8e614ee4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)



------------------
This commit was generated by Migit
2017-10-16 10:44:19 +02:00
TangoCash
4ff55c6d1b let playback handle devices
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f0397c363
Author: TangoCash <eric@loxat.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-15 17:36:35 +02:00
vanhofen
e68b2c1260 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/streaminfo2.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f166f36e9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)



------------------
This commit was generated by Migit
2017-10-14 16:10:22 +02:00
vanhofen
a5478f7798 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5fb26c405
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 16:07:44 +02:00
Jacek Jendrzej
a1d2509af1 streaminfo2: add desc to audiotype
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff61f5aef1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 13:26:55 +02:00
vanhofen
4585b1b547 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2470f59ece
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 12:41:52 +02:00
vanhofen
2f91dbff13 yWeb: fix grab-handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 488d8a6670
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)

Origin message was:
------------------
- yWeb: fix grab-handling

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 12:41:20 +02:00
vanhofen
e430664539 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64994c769c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 12:22:23 +02:00
vanhofen
66838fd284 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9c252d81f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 12:22:05 +02:00
Michael Liebmann
a8b6b60fbc CBEBouquetWidget::getInfoText(): Fix compile error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9365e09ab9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 10:02:50 +02:00
vanhofen
44cf2e9ab0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14f190ac6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 08:41:42 +02:00
vanhofen
a76d358dfe cc-footer: remove our calcation of label-width; should now work automatically
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8aad36ed83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)

Origin message was:
------------------
- cc-footer: remove our calcation of label-width; should now work automatically

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 08:40:11 +02:00
vanhofen
bb2b748ea3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)



------------------
This commit was generated by Migit
2017-10-14 07:15:30 +02:00
vanhofen
7667bf5f01 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-14 07:10:33 +02:00
vanhofen
f39ef8ad1d yWeb: fix manual selection of remote control
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41e94dbaa3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)

Origin message was:
------------------
- yWeb: fix manual selection of remote control

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-10-13 18:40:49 +02:00