mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,721 Commits 2 Branches 9 Tags
f1c074fc83c3b52840d83acfc683d3854ee4bed3
Commit Graph

1482 Commits

Author SHA1 Message Date
vanhofen
c8aeed6eeb Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start" 
This reverts commit 2d4130dab8 in
preparation for following changes.

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: affcf191a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)
 2017-08-14 09:56:23 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 20:06:40 +02:00
vanhofen
c3dc7849b9 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 368c043a54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 17:34:29 +02:00
vanhofen
8f336e9552 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c654c35d70
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 15:59:38 +02:00
vanhofen
e21f270c04 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 08:20:56 +02:00
GetAway
d7b6312321 neutrino.cpp: repaint of background in radio mode, when close UPNP-Browser 
Origin commit data
------------------
Commit: 95b535016f
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)
 2017-08-07 07:52:32 +02:00
vanhofen
64c47582f4 fix merge-error 
Origin commit data
------------------
Commit: 1da05b3cee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- fix merge-error
 2017-08-01 12:37:12 +02:00
vanhofen
e540017d8b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e0364d9b3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
 2017-08-01 12:36:04 +02:00
vanhofen
9d6d2daeb7 fix hw_caps init for non-coolstream hardware 
Origin commit data
------------------
Commit: 0732790aea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- fix hw_caps init for non-coolstream hardware
 2017-08-01 12:35:25 +02:00
vanhofen
ff24e343ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: edf3dfdc18
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
 2017-08-01 11:15:08 +02:00
Jacek Jendrzej
01fd3b4e90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 21:43:36 +02:00
vanhofen
1e05ae41b4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e7f499e8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 13:39:15 +02:00
TangoCash
e17852237a no shutdown if streaming (thx dbo) 
prevent shutdown from timer if stb is started from deep standby > does a
timer-record > and meanwhile streaming (eg. localTV or via web-if to PC)
is active

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


Origin commit data
------------------
Commit: 57f46e1f2b
Author: TangoCash <eric@loxat.de>
Date: 2017-07-05 (Wed, 05 Jul 2017)
 2017-07-05 10:41:27 +02:00
vanhofen
94e386d4ac Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
 2017-07-04 14:07:10 +02:00
vanhofen
a828c8a32a epgscan: allow to set rescan period to catch a bug in epgscan 
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

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


Origin commit data
------------------
Commit: 761a2b2e73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-07-04 12:22:53 +02:00
vanhofen
fe6f8eb2b2 epgscan: allow to set rescan period to catch a bug in epgscan 
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.


Origin commit data
------------------
Commit: 36a1a146fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.
 2017-07-04 11:07:30 +02:00
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 12:32:31 +02:00
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 11:07:32 +02:00
vanhofen
a4aa97f4c5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 10:37:41 +02:00
Thilo Graf
b705d884ad CNeutrinoApp: add hook for neutrino start 
Script will be executed on start of neutrino before. Handling is similar
like all other possible hooks, see global.h.


Origin commit data
------------------
Commit: 78f1b294a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 09:07:02 +02:00
vanhofen
c35224ff08 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
 2017-06-10 11:43:50 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
vanhofen
5a9e9904a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 15:14:51 +02:00
Michael Liebmann
9767657185 Merge branch 'pu/fb-setmode' 
Origin commit data
------------------
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:18:01 +02:00
Thilo Graf
707c74df83 Followscreenings: add enumeration for a better readability 
Origin commit data
------------------
Commit: 141d198b29
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:17:12 +02:00
vanhofen
7945ff5f14 filebrowser: use "dirs first" sort method by default 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 64f35bd2ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- filebrowser: use "dirs first" sort method by default

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-07 14:17:11 +02:00
vanhofen
ca9dcef5d2 align fontsize.filebrowser_item to new default 
Origin commit data
------------------
Commit: 7aaa42917e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- align fontsize.filebrowser_item to new default
 2017-06-06 21:55:39 +02:00
vanhofen
8bc30b2a4b add prgressbar.gradient when migrating from CProgressBar::PB_GRAPHIC 
Origin commit data
------------------
Commit: 7b2a2d1f84
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- add prgressbar.gradient when migrating from CProgressBar::PB_GRAPHIC
 2017-06-06 17:18:58 +02:00
vanhofen
a0ec4edf2e remove graphic progressbar 
Origin commit data
------------------
Commit: 675c0dc6f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- remove graphic progressbar
 2017-06-06 00:09:31 +02:00
vanhofen
dc8cff4f99 neutrino: remove pointless easymenu console output 
Origin commit data
------------------
Commit: 50dd0fb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- neutrino: remove pointless easymenu console output
 2017-05-30 15:57:48 +02:00
vanhofen
0b3a86f7f5 followscreenings: fix CFollowScreenings::FOLLOWSCREENINGS_ALWAYS 
* add enumeration for a better readability


Origin commit data
------------------
Commit: 981c6331a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- followscreenings: fix CFollowScreenings::FOLLOWSCREENINGS_ALWAYS

* add enumeration for a better readability
 2017-05-30 10:11:39 +02:00
vanhofen
b4fecd0bdb Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
 2017-05-30 01:27:37 +02:00
vanhofen
c2ddeb788a filebrowser: use "dirs first" sort method by default 
Origin commit data
------------------
Commit: b0f6ab481d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- filebrowser: use "dirs first" sort method by default
 2017-05-30 01:24:21 +02:00
vanhofen
59852c47dd Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)
 2017-05-23 17:59:21 +02:00
gixxpunk
5f0192b3af Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox 
Origin commit data
------------------
Commit: 468022c3cc
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-18 (Thu, 18 May 2017)
 2017-05-18 08:40:58 +02:00
gixxpunk
551807d7b1 CVFD: do not show "save epg" in standby 
Origin commit data
------------------
Commit: 1f221f13e6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-18 (Thu, 18 May 2017)

Origin message was:
------------------
- CVFD: do not show "save epg" in standby
 2017-05-18 08:40:33 +02:00
vanhofen
9948881442 align existing g_settings.movieplayer_bisection_jump to new value 
Origin commit data
------------------
Commit: d657f993c4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- align existing g_settings.movieplayer_bisection_jump to new value
 2017-05-16 15:47:26 +02:00
vanhofen
497db594c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)
 2017-05-16 15:28:08 +02:00
vanhofen
53007ef0a9 movieplayer: make bisection jump period configurable 
Origin commit data
------------------
Commit: 69e5cb286c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: make bisection jump period configurable
 2017-05-16 15:26:20 +02:00
vanhofen
77ac470486 movieplayer: allow bisectional jumps with RC_page_up/down 
based upon code by TangoCash


Origin commit data
------------------
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash
 2017-05-13 17:45:59 +02:00
Jacek Jendrzej
e6f3ee9c94 Merge branch 'master' into pu/mp 
except 3e0a8d3ff0 2d4130dab8


Origin commit data
------------------
Commit: fb23ac0126
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
 2017-05-10 15:37:31 +02:00
Thilo Graf
ccdf4ef3da Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 60fed9cc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
 2017-05-10 10:45:28 +02:00
gixxpunk
ff8ad12d1b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4c0d6c0930
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-09 (Tue, 09 May 2017)
 2017-05-09 18:36:27 +02:00
vanhofen
3e0a8d3ff0 clearify comment 
Origin commit data
------------------
Commit: c08144a9d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- clearify comment
 2017-05-09 13:31:59 +02:00
vanhofen
6c8e98d454 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4b76adcc02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:50:19 +02:00
vanhofen
a76db329fa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:46:54 +02:00
vanhofen
2d4130dab8 neutrino: fix hw_caps init; it must be initialized after zapit start 
Origin commit data
------------------
Commit: edb0a5937e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- neutrino: fix hw_caps init; it must be initialized after zapit start
 2017-05-08 23:44:45 +02:00
vanhofen
ff7fc4971a Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	acinclude.m4
	src/neutrino.cpp


Origin commit data
------------------
Commit: 7f989a3625
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)
 2017-03-31 17:47:29 +02:00
vanhofen
bb03a67aa7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 21:02:27 +02:00
vanhofen
dd6d985e19 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 08:05:10 +02:00