Commit Graph

1003 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Michael Liebmann
317286e9ad Sort locale
Origin commit data
------------------
Commit: be469d3549
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-16 15:11:39 +02:00
vanhofen
2be5df305e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 19:08:28 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers
Origin commit data
------------------
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers
2016-08-15 19:02:42 +02:00
vanhofen
4d2040dd5f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 76b68b0a26
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 12:32:24 +02:00
vanhofen
db2e5a11d9 colors: make footer text color configurable
Origin commit data
------------------
Commit: 8c7952011e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer text color configurable
2016-08-15 12:16:49 +02:00
vanhofen
2dc8a2a968 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/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 00:19:32 +02:00
vanhofen
70abfb3339 colors: make footer background color configurable
TODO: footer text color and maybe footer font


Origin commit data
------------------
Commit: cc5258e6d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font
2016-08-15 00:14:47 +02:00
vanhofen
0d1e6e34d7 webtv_setup: allow to reload webtv xml files
Origin commit data
------------------
Commit: 5fb5f94493
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)

Origin message was:
------------------
- webtv_setup: allow to reload webtv xml files
2016-08-09 12:06:18 +02:00
vanhofen
250c539e03 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 6cbd5046d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)
2016-08-08 23:41:45 +02:00
vanhofen
58dda090b9 locals: pay attention to upper/lower case for online services
Origin commit data
------------------
Commit: 5ccca6c1af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)

Origin message was:
------------------
- locals: pay attention to upper/lower case for online services
2016-08-08 23:40:09 +02:00
vanhofen
547f049745 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/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 646a41c52f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)
2016-08-08 23:18:12 +02:00
vanhofen
c128b2950b allow to disable online services w/o cleaning the keys
Origin commit data
------------------
Commit: db896847b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)

Origin message was:
------------------
- allow to disable online services w/o cleaning the keys
2016-08-08 23:11:17 +02:00
vanhofen
812d95d50c 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/gui/epgview.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 4d898949e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)
2016-08-06 23:06:36 +02:00
vanhofen
6b442c8394 add submenu to configure and control online services like youtube, shoutcast and tmdb
Origin commit data
------------------
Commit: a291b11300
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- add submenu to configure and control online services like youtube, shoutcast and tmdb
2016-08-06 22:52:37 +02:00
vanhofen
41083ff567 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)
2016-08-04 12:02:35 +02:00
vanhofen
e3daec4e2d eventlist: allow to disable epgplus
Origin commit data
------------------
Commit: 5837b922b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- eventlist: allow to disable epgplus
2016-08-04 09:44:36 +02:00
vanhofen
990a4ed4fd epgview: add own locale for tmdb-info
Origin commit data
------------------
Commit: da9e024d40
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- epgview: add own locale for tmdb-info
2016-08-03 23:56:16 +02:00
vanhofen
c19bba8a68 icons: add imdb icon
Origin commit data
------------------
Commit: a8743502fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- icons: add imdb icon
2016-08-02 15:07:42 +02:00
gixxpunk
1053f4f323 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 187bdbd39b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-07-07 (Thu, 07 Jul 2016)
2016-07-07 17:22:39 +02:00
Jacek Jendrzej
4df768fad6 update slovak.locale (THX Pr0metheus)
Origin commit data
------------------
Commit: 5560b86066
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-07-06 (Wed, 06 Jul 2016)
2016-07-06 18:43:52 +02:00
vanhofen
21b7299720 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)
2016-07-01 15:28:37 +02:00
martii
f1e25395ca followscreenings: port code from martiis-neutrino-mp
Origin commit data
------------------
Commit: 61105699d4
Author: martii <m4rtii@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)

Origin message was:
------------------
- followscreenings: port code from martiis-neutrino-mp
2016-07-01 15:26:06 +02:00
gixxpunk
bb17dedf23 install additional fonts and use Roboto-Regular.ttf as new neutrino default font
Origin commit data
------------------
Commit: c62e02cd2c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)

Origin message was:
------------------
- install additional fonts and use Roboto-Regular.ttf as new neutrino default font
2016-06-23 17:56:22 +02:00
vanhofen
4b9ec70b4d Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: e4f10048ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-10 (Fri, 10 Jun 2016)
2016-06-10 07:55:38 +02:00
vanhofen
a7f0a58f70 slovak.locale: update
Origin commit data
------------------
Commit: 0c8dd068bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-07 (Tue, 07 Jun 2016)

Origin message was:
------------------
- slovak.locale: update
2016-06-07 17:27:39 +02:00
vanhofen
64322561e4 cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
Origin commit data
------------------
Commit: bacba3c555
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-07 (Tue, 07 Jun 2016)

Origin message was:
------------------
- cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"
2016-06-07 17:09:34 +02:00
vanhofen
cc0f541291 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: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
2016-06-02 21:42:10 +02:00
vanhofen
2c239533a6 record_setup: add check existing recordings before set new timers
Origin commit data
------------------
Commit: 6dddaff0d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)

Origin message was:
------------------
- record_setup: add check existing recordings before set new timers
2016-06-02 21:37:33 +02:00
vanhofen
b3f31baf5f data/scripts/backup.sh: don't use $(hostname) in $DATE variable
Origin commit data
------------------
Commit: e124b0e99b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-01 (Wed, 01 Jun 2016)

Origin message was:
------------------
- data/scripts/backup.sh: don't use $(hostname) in $DATE variable
2016-06-01 21:03:25 +02:00
vanhofen
8dc3ed3662 data/scripts/backup.sh: add some usefull entrys
Origin commit data
------------------
Commit: b8399b6da9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-01 (Wed, 01 Jun 2016)

Origin message was:
------------------
- data/scripts/backup.sh: add some usefull entrys
2016-06-01 21:03:25 +02:00
FlatTV
321fcbf98f Zap when recording needs CAM
Origin commit data
------------------
Commit: 7556db08f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-05-31 (Tue, 31 May 2016)
2016-05-31 22:32:04 +02:00
vanhofen
384d73b425 lcd4linux: allow to switch umlauts conversion
Origin commit data
------------------
Commit: 4a7696b404
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-24 (Tue, 24 May 2016)

Origin message was:
------------------
- lcd4linux: allow to switch umlauts conversion
2016-05-24 10:32:02 +02:00
vanhofen
cabdaa1a6a data/fonts/Makefile.am: re-use md_khmurabi_10.ttf as neutrino.ttf
Origin commit data
------------------
Commit: 9852a3d9a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-22 (Sun, 22 May 2016)

Origin message was:
------------------
- data/fonts/Makefile.am: re-use md_khmurabi_10.ttf as neutrino.ttf
2016-05-22 00:05:41 +02:00
gixxpunk
5564871898 icons: use NI icons
Origin commit data
------------------
Commit: 6fc8043b5c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- icons: use NI icons
2016-05-21 23:58:45 +02:00
vanhofen
c79159d603 locale: fix wrong entry
Origin commit data
------------------
Commit: 55ccf38c6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- locale: fix wrong entry
2016-05-21 21:46:43 +02:00