mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
16,110 Commits 2 Branches 9 Tags
caef1eb2bc6f7a2db8afcc85d0f96b22733cbc57
Commit Graph

323 Commits

Author SHA1 Message Date
Michael Liebmann
39fdfa9fdd configure.ac: bump revision to 3.4.1 
Origin commit data
------------------
Commit: a9d6133765
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-31 (Tue, 31 Jan 2017)
 2017-01-31 17:15:17 +01:00
vanhofen
550611ef8c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	src/gui/screensaver.cpp
	src/gui/volumebar.cpp


Origin commit data
------------------
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)
 2017-01-31 16:48:40 +01:00
Michael Liebmann
686b809591 configure.ac: Check freetype version >= 2.5.0 
Origin commit data
------------------
Commit: 86c3b08533
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
 2017-01-31 16:36:42 +01:00
vanhofen
c64c3f48c6 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fa6cac3836
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 16:33:02 +01:00
vanhofen
149638164c configure.ac: fix native build 
Origin commit data
------------------
Commit: ef78979165
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)

Origin message was:
------------------
- configure.ac: fix native build
 2017-01-30 14:18:31 +01:00
Michael Liebmann
de641b0c55 Revert "configure.ac: Fix freetype check" 
This reverts commit 2674a44fe5.


Origin commit data
------------------
Commit: a84b07ee86
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 07:15:12 +01:00
vanhofen
b0faca6cc0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:32:04 +01:00
vanhofen
4319451ff9 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ed73077c19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-28 (Sat, 28 Jan 2017)
 2017-01-28 12:32:09 +01:00
Michael Liebmann
2674a44fe5 configure.ac: Fix freetype check 
- Supplement for commit 2602f6c122


Origin commit data
------------------
Commit: 220c50eebf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-28 (Sat, 28 Jan 2017)
 2017-01-28 09:31:47 +01:00
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +01:00
vanhofen
53c811be8e Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8b6265c2a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:08 +01:00
Michael Liebmann
2602f6c122 configure.ac: Check freetype version >= 2.5.0 
Origin commit data
------------------
Commit: 33283d77bd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
 2017-01-26 18:26:28 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
 2017-01-22 22:59:39 +01:00
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 15:15:34 +01:00
vanhofen
992b7b6980 bump neutrino version to 3.30 
Origin commit data
------------------
Commit: d97261772c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- bump neutrino version to 3.30
 2016-12-19 17:55:15 +01:00
vanhofen
da7d049c52 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 1c47a38c87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 15:06:21 +01:00
vanhofen
5c391a82b8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 14:12:33 +01:00
vanhofen
1f85db63a9 configure.ac: sort Makefiles alphabetically 
Origin commit data
------------------
Commit: 48d0c1321d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- configure.ac: sort Makefiles alphabetically
 2016-12-15 14:00:45 +01:00
vanhofen
0a874ca762 yWeb: move data from /src to /data 
Origin commit data
------------------
Commit: 29847283ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- yWeb: move data from /src to /data
 2016-12-15 14:00:45 +01:00
vanhofen
984b4378c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 3ead60b3fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 12:35:53 +01:00
vanhofen
c29c3fc07f fix last commit 
Origin commit data
------------------
Commit: 9bcdd3487a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- fix last commit
 2016-12-07 11:24:30 +01:00
vanhofen
b50cceee20 icons: move NI icons into categorized subdirectories 
Origin commit data
------------------
Commit: 7ada0f42ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move NI icons into categorized subdirectories
 2016-12-07 11:14:14 +01:00
vanhofen
7e0aeb835f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/Makefile.am
	data/icons/Makefile.am


Origin commit data
------------------
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 10:55:25 +01:00
vanhofen
d2f4ae06e2 icons: move icons into categorized subdirectories 
Origin commit data
------------------
Commit: d5ca9aa0bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move icons into categorized subdirectories
 2016-12-07 10:36:47 +01:00
vanhofen
73ca7cf0c8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 20:46:37 +01:00
vanhofen
9a073920a3 configure.ac: change package name/version 
Origin commit data
------------------
Commit: 1530291023
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- configure.ac: change package name/version
 2016-12-05 10:54:11 +01:00
Stefan Seyfried
e4103adb9e configure: fix package name 
Origin commit data
------------------
Commit: 50790498b1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:26:45 +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
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
887bc80d84 prepare revision, bump version to 3.4.0 
Origin commit data
------------------
Commit: 4e3d2c854b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)
 2016-11-18 18:17:10 +01:00
vanhofen
83e62e9d50 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
 2016-11-17 09:52:47 +01:00
vanhofen
2a64edef4f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 23:43:57 +01:00
Stefan Seyfried
24d2ccfea6 make sure the private dvb headers are used on coolstream 
Origin commit data
------------------
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 20:30:14 +01:00
vanhofen
ca02e09411 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:30:10 +02:00
vanhofen
9eae77e776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 10:06:31 +02:00
Stefan Seyfried
0897cd1c24 configure: fix short-filename logic 
if configure was not called from absolute path, detection
would fail and huge filenames would be included in binary
(noticed in yocto krogoth release)


Origin commit data
------------------
Commit: b8cf8167f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-20 (Thu, 20 Oct 2016)
 2016-10-24 10:00:51 +02:00
vanhofen
da3d97b77e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 21:57:00 +02:00
Stefan Seyfried
2dc1461e12 make curl and freetype2 detection crosscompile-friendly 
Origin commit data
------------------
Commit: a40b58fa20
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2016-10-23 17:24:07 +02:00
Stefan Seyfried
adee2844ce configure: remove unused LIBCS_* variables 
(forward ported neutrino-mp commit 45b4bb0488d)


Origin commit data
------------------
Commit: f6d09bd0ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 12:23:05 +02:00
Stefan Seyfried
07a1df57f1 remove obsolete embedded libtriple 
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
(forward ported neutrino-mp commit 2158fee441)


Origin commit data
------------------
Commit: 57078ed23d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 12:19:06 +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
Stefan Seyfried
576ef77919 configure: fix short-filename logic 
if configure was not called from absolute path, detection
would fail and huge filenames would be included in binary
(noticed in yocto krogoth release)


Origin commit data
------------------
Commit: 4cb5245546
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-20 (Thu, 20 Oct 2016)
 2016-10-20 09:11:39 +02:00
vanhofen
6b7921ba63 configure.ac: remove useless LIBCS-stuff 
Origin commit data
------------------
Commit: b1c7f4587a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)

Origin message was:
------------------
- configure.ac: remove useless LIBCS-stuff
 2016-09-26 23:13:10 +02:00
Thilo Graf
eb5f8db385 Moviebrowser: start outsourcing moviebrowser code 
Origin commit data
------------------
Commit: 09c5d23adf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
 2016-09-20 08:03:50 +02:00
vanhofen
57dd1c7712 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 3a43baac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:41:28 +02:00
vanhofen
c36373040d Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:24:30 +02:00
Thilo Graf
b0c0c3bd05 Moviebrowser: start outsourcing moviebrowser code 
Origin commit data
------------------
Commit: 64053c1758
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
 2016-09-06 11:32:41 +02:00
vanhofen
b71499ce2e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 22e12bdfa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-05 (Mon, 05 Sep 2016)
 2016-09-05 23:53:07 +02:00
Michael Liebmann
bd039291bd Add alternative variant for the display of __FILE__ (__path_file__) 
- __path_file__ includes the relevant parts of source path


Origin commit data
------------------
Commit: 92a88906a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-04 (Sun, 04 Sep 2016)
 2016-09-05 23:46:01 +02:00