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
15,932 Commits 2 Branches 9 Tags
d94ba3259b085cc3a558a3396e4a6f7fd72fac6d
Commit Graph

208 Commits

Author SHA1 Message Date
vanhofen
cd9542ed2a update: remove unused UPDATE_LOCAL_FILENAME define 
Origin commit data
------------------
Commit: 2caf1f6661
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: remove unused UPDATE_LOCAL_FILENAME define
 2017-12-26 00:36:06 +01:00
vanhofen
61db02b977 update: move RELEASE_CYCLE define to configure.ac 
Origin commit data
------------------
Commit: 32a5689d19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: move RELEASE_CYCLE define to configure.ac
 2017-12-26 00:36:06 +01:00
vanhofen
51d307022d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2087f6202e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-03 (Sun, 03 Dec 2017)
 2017-12-03 20:57:41 +01:00
Jacek Jendrzej
5cae76c7c2 typo 
Origin commit data
------------------
Commit: a6a256190b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-03 (Sun, 03 Dec 2017)
 2017-12-03 10:57:20 +01:00
Jacek Jendrzej
89516e3326 fix resource leak 
Origin commit data
------------------
Commit: 1f96c8a4d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-03 (Sun, 03 Dec 2017)
 2017-12-03 10:47:05 +01:00
vanhofen
382f02d3b2 update: fix display of installed version; ... 
curiously it was only broken on ARM_HARDWARE

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


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

Origin message was:
------------------
- update: fix display of installed version; ...

curiously it was only broken on ARM_HARDWARE

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
13ecef5460 update: fix display of installed version; ... 
curiously it was only broken on ARM_HARDWARE


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

Origin message was:
------------------
- update: fix display of installed version; ...

curiously it was only broken on ARM_HARDWARE
 2017-11-11 11:02:11 +01:00
vanhofen
cf78f27219 re-remove unneeded ifdefs 
Origin commit data
------------------
Commit: 61e2bebfd8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-11 (Sat, 11 Nov 2017)

Origin message was:
------------------
- re-remove unneeded ifdefs
 2017-11-11 08:59:04 +01:00
vanhofen
55bac2cf05 update: ask for copy settings to new image 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4a5adfcb23
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- update: ask for copy settings to new image

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:47:16 +01:00
vanhofen
fa339bd7fb update: allow ofgwrite to flash another partition 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 80a9198603
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:37:41 +01:00
vanhofen
f609c543ef update: fix osd flickering 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9a364075ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- update: fix osd flickering

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:33:47 +01:00
vanhofen
e6b09619c9 update: allow online-update for AX/Mutant; add some beautiful ifdef's 
Signed-off-by: Thilo Graf <dbt@novatux.de>
#ifdefs not really beautiful but sometimes inevitable


Origin commit data
------------------
Commit: ba126c3a2c
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

Signed-off-by: Thilo Graf <dbt@novatux.de>
#ifdefs not really beautiful but sometimes inevitable
 2017-10-29 18:37:40 +01:00
vanhofen
95813b4b65 update: allow tgz-tarballs for update via ofgwrite 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7e974bc716
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- update: allow tgz-tarballs for update via ofgwrite

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 18:34:24 +01:00
vanhofen
5e58fc9c7b update: ask for copy settings to new image 
Origin commit data
------------------
Commit: 1b5b18c2f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- update: ask for copy settings to new image
 2017-10-27 13:17:17 +02:00
vanhofen
25778e2985 update: allow ofgwrite to flash another partition 
Origin commit data
------------------
Commit: 28f522884e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition
 2017-10-26 21:42:51 +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
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
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
7fcd8dea4c add hd51; mostly ported from TangoCash's neutrino-mp 
Origin commit data
------------------
Commit: 09ae4c3a51
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
 2017-10-05 12:52:53 +02:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:19:49 +02:00
Jacek Jendrzej
f4c51e829b Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 13:56:25 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files 
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +02:00
vanhofen
cf8a76c2ce Revert "Revert "- remove obsolete ifdef's"" 
This reverts commit 7aa4eed69b.


Origin commit data
------------------
Commit: 3c3707b119
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:47:26 +02:00
vanhofen
7aa4eed69b Revert "- remove obsolete ifdef's" 
This reverts commit 8ce36eb9e1.


Origin commit data
------------------
Commit: a6814161a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 16:45:10 +02:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
8ce36eb9e1 remove obsolete ifdef's 
Origin commit data
------------------
Commit: 4aecc9f1b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- remove obsolete ifdef's
 2017-03-10 15:27:30 +01:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 19:32:30 +01:00
vanhofen
9f3dad285f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 10:38:14 +01:00
vanhofen
e714a2ae52 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 18:18:07 +01:00
vanhofen
9d0dd14108 update: rename DEBUG1 to DRYRUN 
Origin commit data
------------------
Commit: 00d2d557c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: rename DEBUG1 to DRYRUN
 2017-03-01 18:16:09 +01:00
vanhofen
b95f60030e update: small cleanup; ... 
remove obsolete g_Locale->getText() from ShowHint calls


Origin commit data
------------------
Commit: ea3ab21bb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: small cleanup; ...

remove obsolete g_Locale->getText() from ShowHint calls
 2017-03-01 18:16:09 +01:00
vanhofen
49a0062588 update: change filetype comparsion; "< '3'" to "<= '2'" 
Origin commit data
------------------
Commit: 2a9b39f45f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: change filetype comparsion; "< '3'" to "<= '2'"
 2017-03-01 18:16:09 +01:00
vanhofen
9591b9a0fc update: prepare for menu hints 
Origin commit data
------------------
Commit: 943c03fc52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: prepare for menu hints
 2017-03-01 18:16:09 +01:00
vanhofen
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
vanhofen
e97d93f824 NI-code: Rename hardware defined macros for coolstream stb 
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
 2017-02-12 21:57:06 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +01:00
Stefan Seyfried
c4cc5e62bb Merge remote-tracking branch 'tuxbox/pu/fb-modules' 
only compile tested ;-)


Origin commit data
------------------
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:29:10 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 2017-02-12 09:21:04 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
16710bc50a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 9f9681b770
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 01:06:59 +01:00
vanhofen
fb45e1d98c update: fix evaluation of int newfound 
Origin commit data
------------------
Commit: 88ebe68b39
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- update: fix evaluation of int newfound
 2016-11-21 01:04:22 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
b76e14080e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/nhttpd/web/Makefile.am
	src/nhttpd/web/Y_Blocks.txt
	src/nhttpd/web/Y_Menue.yhtm
	src/nhttpd/web/Y_Settings_yWeb.yhtm


Origin commit data
------------------
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
 2016-10-01 11:54:51 +02:00
Michael Liebmann
65c4cfec97 Set correct path for /.version if TARGET_PREFIX is in use. 
Origin commit data
------------------
Commit: 312a80bee9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-25 (Sun, 25 Sep 2016)
 2016-10-01 11:47:59 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00