mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,690 Commits 2 Branches 9 Tags
bff3c86938d65818f677d24d9e50d57c5463be0b
Commit Graph

1042 Commits

Author SHA1 Message Date
vanhofen
bff3c86938 re-add our welcome message to vfd; we're NI \o/ 
Origin commit data
------------------
Commit: 9d5fb8ee3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)

Origin message was:
------------------
- re-add our welcome message to vfd; we're NI \o/
 2016-11-19 21:30:53 +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
2e5604e384 Locales: use generic gui name in messages and windows 
Origin commit data
------------------
Commit: 1b4f976c6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)
 2016-11-18 17:46:17 +01:00
Thilo Graf
7bb3ecdc45 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
 2016-11-17 21:53:06 +01:00
vanhofen
ff4fb2d640 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
 2016-11-17 01:48:51 +01:00
vanhofen
65b818f8aa locale: small changes in moviebrowser's bookmark locales 
Origin commit data
------------------
Commit: 7a3839c7f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser's bookmark locales
 2016-11-17 01:48:32 +01:00
Thilo Graf
ffa144101a Merge branch 'master' into pu/msgbox 
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp
 2016-11-15 19:49:27 +01:00
vanhofen
c94723bf8e followscreenings: re-add possibility to show followscreenings in every case 
This commit replaces formerly commit 69d0362c07


Origin commit data
------------------
Commit: b7838210a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- followscreenings: re-add possibility to show followscreenings in every case

This commit replaces formerly commit 69d0362c07
 2016-11-15 00:05:02 +01:00
vanhofen
c0a3c0f5e3 Revert "Recording Menu: Add option "Always show timer pick list"" 
This reverts commit 69d0362c07.


Origin commit data
------------------
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
 2016-11-14 23:05:36 +01:00
vanhofen
7f4aad9b4a Revert "- deutsch.locale: minor changes in menu.hint_record_tevents" 
This reverts commit b00f976d54.


Origin commit data
------------------
Commit: 23cbcbcdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
 2016-11-14 23:05:20 +01:00
vanhofen
b0d3e0f4ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
 2016-11-14 23:02:33 +01:00
vanhofen
66639b877f followscreenings: allow to turn off followscreenings list 
Origin commit data
------------------
Commit: d6cb1d206f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- followscreenings: allow to turn off followscreenings list
 2016-11-14 22:58:43 +01:00
Thilo Graf
dc607fd1df Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 21:33:12 +01:00
vanhofen
f717e1ea75 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: abb8e5f02a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 13:59:11 +01:00
vanhofen
3bfe860a5d locale: small changes in moviebrowser locales 
Origin commit data
------------------
Commit: af9672edb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser locales
 2016-11-11 13:46:55 +01:00
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
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
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
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
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
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