mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,267 Commits 2 Branches 9 Tags
ace2bc3f53bbfbdcc8e331c0593e3533a12a7eb1
Commit Graph

1816 Commits

Author SHA1 Message Date
Thilo Graf
d34322b568 Merge branch 'master' into pu/msgbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
 2016-11-10 10:27:22 +01:00
vanhofen
9e86fba5d9 Merge branch 'master' into pu/moviebrowser 
Origin commit data
------------------
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 13:46:01 +01:00
vanhofen
398a5d8a2b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 12:57:58 +01:00
Thilo Graf
e4bc926b72 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 23:16:36 +01:00
vanhofen
3187257edc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 7b469ff17d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 20:30:18 +01:00
FlatTV
72d1110d5e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 08:15:03 +01:00
vanhofen
5e38b543fc locale: update slovak; thx to Pr0metheus 
Origin commit data
------------------
Commit: 7cbe38e249
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus
 2016-11-05 22:15:49 +01:00
vanhofen
78d9f348bf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:11:37 +01:00
Thilo Graf
eb0224cfc9 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 28a146e0ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 00:08:05 +01:00
vanhofen
b00f976d54 deutsch.locale: minor changes in menu.hint_record_tevents 
Origin commit data
------------------
Commit: 7276489faf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- deutsch.locale: minor changes in menu.hint_record_tevents
 2016-11-04 22:30:21 +01:00
vanhofen
877b26d1c9 cablex.xml: update Unitymedia; thx to klauser 
Origin commit data
------------------
Commit: bf987b7478
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser
 2016-11-04 16:49:01 +01:00
vanhofen
9c7ace48cf cablex.xml: update Unitymedia; thx to klauser 
Origin commit data
------------------
Commit: b94f35421a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser
 2016-11-04 16:46:47 +01:00
vanhofen
dbfd2214db Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 09:50:10 +01:00
vanhofen
e2c1dbc75b Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6a196e6645
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 08:49:37 +01:00
vanhofen
329b279cad moviebrowser: smaller locales for footer; clearify "filter off" mode 
Origin commit data
------------------
Commit: 9d2661a1d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- moviebrowser: smaller locales for footer; clearify "filter off" mode
 2016-11-02 08:27:21 +01:00
FlatTV
69d0362c07 Recording Menu: Add option "Always show timer pick list" 
"when choosing recording from EPG, view Timer list even no further
entries found" yes/no


Origin commit data
------------------
Commit: f2437b5b06
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-30 (Sun, 30 Oct 2016)
 2016-10-30 11:32:42 +01:00
vanhofen
c5125da443 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 12:45:02 +02:00
Thilo Graf
eae883a161 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: aae4411d03
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 12:38:17 +02:00
vanhofen
ae7fdf2555 Merge branch 'master' into pu/moviebrowser 
Origin commit data
------------------
Commit: 1fc717f56f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 12:26:05 +02:00
vanhofen
6cbee866fd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 11:41:02 +02:00
Michael Liebmann
7cee609cbb Sort locale 
Origin commit data
------------------
Commit: 373ae57e42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)
 2016-10-29 10:38:06 +02:00
vanhofen
1e5da313e7 moviebrowser: allow channellist-design in moviebrowser 
Origin commit data
------------------
Commit: 142ae901b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- moviebrowser: allow channellist-design in moviebrowser
 2016-10-29 10:02:07 +02:00
TangoCash
985775b93c add possibility to add Name,Url,Port, Username and Password if needed. 
Origin commit data
------------------
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)
 2016-10-28 22:20:27 +02:00
Thilo Graf
49f57968ed Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: ac59ce80b1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)
 2016-10-26 09:56:49 +02:00
FlatTV
5f14ad95b0 CamMenu: add "no other CI channel" option to usable channels while recording 
Origin commit data
------------------
Commit: f790f6d05d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 18:48:00 +02:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02: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
b7f8c2c220 moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino 
Origin commit data
------------------
Commit: 82f7eff169
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
 2016-10-25 12:19:48 +02:00
Thilo Graf
134c3e53cb CMovieHelp: add localized items 
TODO: add missings locales


Origin commit data
------------------
Commit: 1338ce2b8e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-09 (Sun, 09 Oct 2016)
 2016-10-24 10:31:27 +02: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
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
5fcbcc1c8a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 037dbb0e29
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)
 2016-10-23 16:05:40 +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
f6aa31db0c locale: fix moviebrowser spacer 
trailing whitespace was removed by mistake with 'git rebase --whitespace=fix' :/


Origin commit data
------------------
Commit: 1530bb8e8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- locale: fix moviebrowser spacer

trailing whitespace was removed by mistake with 'git rebase --whitespace=fix' :/
 2016-10-21 23:41:22 +02:00
vanhofen
bf28c38024 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:30:48 +02:00
vanhofen
2510d548e0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 11:23:51 +02:00
TangoCash
796c0781db add locals, add menu to manage box ip's 
Origin commit data
------------------
Commit: 083c547e27
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 10:47:37 +02:00
TangoCash
6b76a665f1 adding remote timer (experimental) 
switch record timers to remote box or back with "play"-key


Origin commit data
------------------
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
 2016-10-21 10:47:37 +02:00
vanhofen
c670b9c47f moviebrowser: add possibility to add spacers to moviebrowser 
Origin commit data
------------------
Commit: 75a2665b87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

Origin message was:
------------------
- moviebrowser: add possibility to add spacers to moviebrowser
 2016-10-21 10:47:37 +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
FlatTV
40ebf8cd0e Cam Menu: Allow switching to all or same transponder channels 
while CI recording


Origin commit data
------------------
Commit: fe69787b0a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)
 2016-10-07 14:37:37 +02:00
vanhofen
9b1904e84d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)
 2016-10-06 21:18:48 +02:00
Thilo Graf
4dd326ab7e Imageinfo: add lua API info 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 6b88cea7bf
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)
 2016-10-03 01:54:06 +02:00
Thilo Graf
fc29cf8824 lua api: fix broken build with --disable-lua 
Origin commit data
------------------
Commit: 1d74379981
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-02 (Sun, 02 Oct 2016)
 2016-10-03 01:44:54 +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
vanhofen
6c8f53938a themes: add three new material themes 
Origin commit data
------------------
Commit: 388541e903
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-23 (Tue, 23 Aug 2016)

Origin message was:
------------------
- themes: add three new material themes
 2016-08-23 15:12:02 +02:00
vanhofen
cc1bf6a654 themes: fix infobar_casystem_alpha in DarkOrange theme 
Origin commit data
------------------
Commit: 966d746694
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- themes: fix infobar_casystem_alpha in DarkOrange theme
 2016-08-22 23:47:06 +02:00
vanhofen
d07f21c2bc icons: transparent background for clock_face icon 
Origin commit data
------------------
Commit: 0958608933
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-22 (Mon, 22 Aug 2016)

Origin message was:
------------------
- icons: transparent background for clock_face icon
 2016-08-22 17:47:39 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
0aeff50e86 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 29b6f4a827
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)
 2016-08-16 15:45:22 +02:00