mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,524 Commits 2 Branches 9 Tags
31010c9c0ad7b7fe5e22b614c94a1d2f3ed94e7c
Commit Graph

12524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
31010c9c0a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ad896ce519
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:51:28 +01:00
vanhofen
82b2684db6 remove incomplete Changelog file 
Origin commit data
------------------
Commit: 3c248e1af8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- remove incomplete Changelog file
 2017-11-03 13:50:59 +01:00
vanhofen
252d05f8c6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ee9fb62dee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:33:54 +01:00
vanhofen
d607c32508 Revert "remove pinentered script , revert 2eab1fa453b1772c8da2a40baa8a15411e3e8852" 
This reverts commit d00ede022c.


Origin commit data
------------------
Commit: f6692bff58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:33:31 +01:00
vanhofen
df07208e75 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ab1b8010a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:05:34 +01:00
vanhofen
1ae9a82620 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e691bceb94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:04:12 +01:00
gixxpunk
38d2d0944d icons: optimize png images for size 
Origin commit data
------------------
Commit: 807f0d8266
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- icons: optimize png images for size
 2017-11-03 12:26:44 +01:00
Jacek Jendrzej
d00ede022c remove pinentered script , revert 2eab1fa453 
Origin commit data
------------------
Commit: ec10cd64e5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 12:25:14 +01:00
Jacek Jendrzej
749f8253fa fix blank screen on start (after merge) 
Origin commit data
------------------
Commit: 0e2efeb9a8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 12:14:26 +01:00
gixxpunk
1bdaf5f56a yweb: optimize png images for size 
Origin commit data
------------------
Commit: e590888ce8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- yweb: optimize png images for size
 2017-11-03 12:07:59 +01:00
gixxpunk
69448680dc yweb: install only box specific remote control pictures 
Origin commit data
------------------
Commit: ffe260d353
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- yweb: install only box specific remote control pictures
 2017-11-03 11:50:38 +01:00
vanhofen
5cc3392ec1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 9fd268cc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 11:09:51 +01:00
vanhofen
d38b57d43e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 255f1a0cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 11:09:28 +01:00
vanhofen
38a431fcda media-menu: disable currently broken audioplayer for ARM_HARDWARE 
Origin commit data
------------------
Commit: 3d91cd9e13
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- media-menu: disable currently broken audioplayer for ARM_HARDWARE
 2017-11-03 10:47:31 +01:00
Jacek Jendrzej
5c5e1b0603 remove unused 
Origin commit data
------------------
Commit: 39440333e8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 10:22:11 +01:00
Jacek Jendrzej
d2ddd61d10 src/gui/movieplayer.cpp reEnable YT 
Origin commit data
------------------
Commit: 9ac5258ac0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 10:02:18 +01:00
Jacek Jendrzej
bab9fac99d src/gui/movieplayer.cpp fix page up/down jump and stop play after merge 
Origin commit data
------------------
Commit: 8746340a87
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 09:53:50 +01:00
vanhofen
06f8a73776 fill webradio_usr.xml with some of my favorite streams 
Origin commit data
------------------
Commit: c709acabb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fill webradio_usr.xml with some of my favorite streams
 2017-11-03 09:36:20 +01:00
vanhofen
357e142728 zapit: save last channel for webradio too 
Origin commit data
------------------
Commit: be1ba2c397
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- zapit: save last channel for webradio too
 2017-11-03 09:36:20 +01:00
vanhofen
4ad2dc407c infoviewer: fix timeout for new mode_webradio 
Origin commit data
------------------
Commit: ec3400f37d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- infoviewer: fix timeout for new mode_webradio
 2017-11-03 09:36:20 +01:00
vanhofen
00653d3f8a try to fix tv <-> radio switch 
Origin commit data
------------------
Commit: e105155830
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- try to fix tv <-> radio switch
 2017-11-03 09:36:20 +01:00
vanhofen
f031dfa928 zapit: don't save webradio-channels as last tv channel 
Origin commit data
------------------
Commit: 49815052f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- zapit: don't save webradio-channels as last tv channel
 2017-11-03 09:36:20 +01:00
vanhofen
bc7bbb92c1 movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12 
Origin commit data
------------------
Commit: 6eea11af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12
 2017-11-03 09:36:20 +01:00
vanhofen
273bb22242 movieplayer: rename isWebTV => isWebChannel 
Origin commit data
------------------
Commit: ee8627a842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: rename isWebTV => isWebChannel
 2017-11-03 09:36:20 +01:00
vanhofen
b5448a9e90 rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Origin commit data
------------------
Commit: cd5577e8b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB
 2017-11-03 09:36:19 +01:00
vanhofen
4f82f61191 scanepg: rename webtv => webchan 
Origin commit data
------------------
Commit: b86a3a1a7a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- scanepg: rename webtv => webchan
 2017-11-03 09:36:19 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
vanhofen
560914abb0 movieplayer: fix new mode 
Origin commit data
------------------
Commit: 1a304cede1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix new mode
 2017-11-03 09:36:19 +01:00
vanhofen
73764d9de0 fix mode in SetChannelMode() 
Origin commit data
------------------
Commit: 4ad5798e48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix mode in SetChannelMode()
 2017-11-03 09:36:19 +01:00
vanhofen
cfe55074b3 fix -Wlogical-op errors 
Origin commit data
------------------
Commit: fe487f3976
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix -Wlogical-op errors
 2017-11-03 09:36:19 +01:00
vanhofen
560bcc7221 add webradio; first steps 
Origin commit data
------------------
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps
 2017-11-03 09:36:19 +01:00
vanhofen
f061d0973e fix another merge error vol.2 
Origin commit data
------------------
Commit: ee3599ea6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error vol.2
 2017-11-03 08:48:54 +01:00
vanhofen
dbc81968f9 fix another merge error 
Origin commit data
------------------
Commit: 59a9cc5dff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error
 2017-11-03 08:45:06 +01:00
vanhofen
fbfecb936d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a26e30482e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 00:10:56 +01:00
vanhofen
28413bca7c fix last merge #2 
Origin commit data
------------------
Commit: c1cea39c1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix last merge #2
 2017-11-03 00:10:32 +01:00
vanhofen
d99f701c0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 00:09:05 +01:00
vanhofen
bb04aa225e fix last merge 
Origin commit data
------------------
Commit: be97dd6bb1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

Origin message was:
------------------
- fix last merge
 2017-11-02 23:48:38 +01:00
vanhofen
6bda6dbce7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 23:25:41 +01:00
Thilo Graf
dbe8dcc351 update version to 3.6.1 
start up AX/Mut@nt hd51 support


Origin commit data
------------------
Commit: 83655f78d6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 21:49:25 +01:00
GetAway
d2896d02c2 menue.cpp: dont use one-time init of a variable that could be changed on runtime 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7c9bf1df92
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 21:31:12 +01:00
vanhofen
137d4c36a9 rename can_set_display_brightness => display_can_set_brightness 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 91fdb1ef6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-02 21:23:01 +01:00
vanhofen
868d95cea9 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Build was broken with original cherry-pick. hw_caps_t was incomplete.


Origin commit data
------------------
Commit: 674ba19c03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal

Signed-off-by: Thilo Graf <dbt@novatux.de>

Build was broken with original cherry-pick. hw_caps_t was incomplete.
 2017-11-02 21:22:01 +01:00
vanhofen
aa0e257316 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4d43af73f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 13:26:06 +01:00
GetAway
548eaef43f menue.cpp: dont use one-time init of a variable that could be changed on runtime 
Origin commit data
------------------
Commit: c1ce74f776
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 13:25:47 +01:00
vanhofen
03c952f742 simple_display: fix c/p error 
Origin commit data
------------------
Commit: b76c213815
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

Origin message was:
------------------
- simple_display: fix c/p error
 2017-11-02 11:18:01 +01:00
vanhofen
ae3ec8850d simple_display: fix some compiler warnings 
Origin commit data
------------------
Commit: 10592800ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix some compiler warnings
 2017-11-01 15:49:47 +01:00
vanhofen
374a711049 simple_display: more readability in togglePower() function 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0fac12001e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: more readability in togglePower() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:44:07 +01:00
vanhofen
a1d88ba3b8 simple_display: fix showRCLock() function 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dbce194f82
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix showRCLock() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:43:43 +01:00
vanhofen
35a31bbff1 epgview: disable epgid debug code 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 61a31e2609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- epgview: disable epgid debug code

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:42:05 +01:00
vanhofen
07862f81ac simple_display: fix text while rc is locked 
Origin commit data
------------------
Commit: 14861ec924
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix text while rc is locked
 2017-11-01 15:41:34 +01:00