Commit Graph

1734 Commits

Author SHA1 Message Date
vanhofen
3c0c5d594a re-add our welcome message to vfd; we're NI \o/
Origin commit data
------------------
Branch: ni/coolstream
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/

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-19 21:30:53 +01:00
vanhofen
a413bfb40d 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
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Thilo Graf
61be99ed13 Locales: use generic gui name in messages and windows
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b4f976c6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 17:46:17 +01:00
Thilo Graf
b39aae929f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 21:53:06 +01:00
vanhofen
b0f13d51ce Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
2016-11-17 09:52:47 +01:00
vanhofen
f4c831795c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:51 +01:00
vanhofen
9d65df3050 locale: small changes in moviebrowser's bookmark locales
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
Thilo Graf
4aa0dca60b Merge branch 'master' into pu/msgbox
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2016-11-15 19:49:27 +01:00
vanhofen
aaf3946608 followscreenings: re-add possibility to show followscreenings in every case
This commit replaces formerly commit 5b4e8952fa


Origin commit data
------------------
Branch: ni/coolstream
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 5b4e8952fa


------------------
This commit was generated by Migit
2016-11-15 00:05:02 +01:00
vanhofen
ff9095e66b Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 5b4e8952fa.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:36 +01:00
vanhofen
9cab869e17 Revert "- deutsch.locale: minor changes in menu.hint_record_tevents"
This reverts commit fa63ad16f7.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23cbcbcdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:20 +01:00
vanhofen
06ab0e9f73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 23:02:33 +01:00
vanhofen
715af20490 followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 22:58:43 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00
Thilo Graf
e85436e185 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 21:33:12 +01:00
vanhofen
3f897d218e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16340ed026
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 13:59:45 +01:00
vanhofen
cae6749ba3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: abb8e5f02a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 13:59:11 +01:00
vanhofen
8c75cc78d2 locale: small changes in moviebrowser locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: af9672edb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 13:46:55 +01:00
Thilo Graf
0018c2b158 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
2016-11-10 10:27:22 +01:00
vanhofen
8b356f92b7 Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-07 13:46:01 +01:00
vanhofen
e5916b320c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf7b22020c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-07 12:57:58 +01:00
Thilo Graf
fbf803565f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-06 23:16:36 +01:00
vanhofen
2c2e712af5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b469ff17d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-06 20:30:18 +01:00
FlatTV
f8a395eba5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-06 08:15:03 +01:00
vanhofen
ccc9e0c65d locale: update slovak; thx to Pr0metheus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cbe38e249
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-05 22:15:49 +01:00
vanhofen
11b0ea0b84 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-05 21:11:37 +01:00
Thilo Graf
d0f320bef1 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28a146e0ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-05 00:08:05 +01:00
vanhofen
fa63ad16f7 deutsch.locale: minor changes in menu.hint_record_tevents
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-04 22:30:21 +01:00
vanhofen
15a345b484 cablex.xml: update Unitymedia; thx to klauser
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-04 16:49:01 +01:00
vanhofen
ea127a5d37 cablex.xml: update Unitymedia; thx to klauser
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-04 16:46:47 +01:00
vanhofen
6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +01:00
vanhofen
c21cc27381 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a196e6645
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-02 08:49:37 +01:00
vanhofen
fde04323f8 moviebrowser: smaller locales for footer; clearify "filter off" mode
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-02 08:27:21 +01:00
FlatTV
5b4e8952fa 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
------------------
Branch: ni/coolstream
Commit: f2437b5b06
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-30 (Sun, 30 Oct 2016)



------------------
This commit was generated by Migit
2016-10-30 11:32:42 +01:00
vanhofen
f7614da769 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
------------------
Branch: ni/coolstream
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)



------------------
This commit was generated by Migit
2016-10-29 12:45:02 +02:00
Thilo Graf
efee734a6c Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aae4411d03
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-29 12:38:17 +02:00
vanhofen
0e9db1640b Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fc717f56f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-29 12:26:05 +02:00
vanhofen
da08c55473 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-29 11:41:02 +02:00
Michael Liebmann
3a5823e382 Sort locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: 373ae57e42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-29 10:38:06 +02:00
vanhofen
dded0065cb moviebrowser: allow channellist-design in moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: 142ae901b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)

Origin message was:
------------------
- moviebrowser: allow channellist-design in moviebrowser

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-29 10:02:07 +02:00
TangoCash
0e87207cab add possibility to add Name,Url,Port, Username and Password if needed.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-28 22:20:27 +02:00
Thilo Graf
fad49dec30 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ac59ce80b1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-26 09:56:49 +02:00
FlatTV
54c9128b89 CamMenu: add "no other CI channel" option to usable channels while recording
Origin commit data
------------------
Branch: ni/coolstream
Commit: f790f6d05d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-25 18:48:00 +02:00
vanhofen
8474ef8c98 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
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
c1bda7d95c moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-25 12:19:48 +02:00
Thilo Graf
fa981956a1 CMovieHelp: add localized items
TODO: add missings locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1338ce2b8e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-09 (Sun, 09 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:27 +02:00
Thilo Graf
36d8d81fa6 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
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
vanhofen
06167cc8d0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec448e14fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-23 21:57:00 +02:00
Stefan Seyfried
569505602b Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 037dbb0e29
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-23 (Sun, 23 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-23 16:05:40 +02:00