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

1956 Commits

Author SHA1 Message Date
vanhofen
280f048c18 themes: add Material Gray (Medium) theme 
Origin commit data
------------------
Commit: 236e6541f2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: add Material Gray (Medium) theme
 2016-12-04 00:40:15 +01:00
vanhofen
9086c24617 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 23:39:21 +01:00
vanhofen
e7f6c23261 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 22:00:25 +01:00
Thilo Graf
da753e0b80 Messages: add localized osd timeout option for interactive/static messages 
TODO: add locales for hints


Origin commit data
------------------
Commit: d6ecaf855b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
 2016-12-02 21:32:15 +01:00
vanhofen
eae5c01db1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
 2016-11-22 23:45:32 +01:00
vanhofen
af486d47a0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: 8bcaeb980d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)
 2016-11-22 23:44:23 +01:00
Michael Liebmann
3949bfb5f7 Add missing locale 
- Supplement to commit ec132fe91b
 and 97b57a783d


Origin commit data
------------------
Commit: ab11919298
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)

Origin message was:
------------------
Add missing locale

 - Supplement to commit ec132fe91b
  and 97b57a783d
 2016-11-22 19:19:30 +01:00
Michael Liebmann
0e62dfb5e5 Sort locale 
Origin commit data
------------------
Commit: b8e314695b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)
 2016-11-22 19:19:30 +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
940432f3aa locale: adapt last changes to our locales 
Origin commit data
------------------
Commit: 72cd1d51a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: adapt last changes to our locales
 2016-11-21 11:52:30 +01:00
vanhofen
60668030c2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Commit: fb596af13d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 10:11:08 +01:00
vanhofen
7dd3603681 locale: use german "usw." instead of "etc." 
Origin commit data
------------------
Commit: fbb6e4c15f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: use german "usw." instead of "etc."
 2016-11-21 09:16:27 +01:00
vanhofen
0119408b81 locale: fix "/" usage 
Origin commit data
------------------
Commit: 47a62dd719
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix "/" usage
 2016-11-21 08:53:26 +01:00
vanhofen
b2842b1d5c locale: remove "CST" strings 
Origin commit data
------------------
Commit: d240c625f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: remove "CST" strings
 2016-11-21 08:40:06 +01:00
vanhofen
8f0fb90012 locale: right case for LEDs 
Origin commit data
------------------
Commit: 5a39da118d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: right case for LEDs
 2016-11-21 08:36:17 +01:00
vanhofen
5b08c63500 locale: fix usage of ampersand; it's not an "and"-replacement 
Origin commit data
------------------
Commit: ed55511778
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix usage of ampersand; it's not an "and"-replacement
 2016-11-21 08:19:26 +01:00
vanhofen
fbec081c11 locale: fix usage of ellipses 
Origin commit data
------------------
Commit: e836943a4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix usage of ellipses
 2016-11-21 07:59:22 +01:00
vanhofen
721e348728 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 00:14:20 +01:00
TangoCash
ec132fe91b add option to read saved epg data frequently 
Origin commit data
------------------
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 19:24:08 +01:00
vanhofen
15205310c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 18:36:35 +01:00
Thilo Graf
ae117fae66 Messages: add option to change size of message text 
Include default size and localized setup.

TODO: localize for nederlands and slovak, current english only.


Origin commit data
------------------
Commit: 4988df1dd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 01:08:14 +01:00
vanhofen
6692b2220f locale: re-add the name "Neutrino" instead of "GUI" in some locales 
Origin commit data
------------------
Commit: 41fe43ae55
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)

Origin message was:
------------------
- locale: re-add the name "Neutrino" instead of "GUI" in some locales
 2016-11-20 01:01:22 +01:00
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
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
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
Stefan Seyfried
2e7aa7be4a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 18:06:26 +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
cb808bce7c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 16340ed026
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
 2016-11-11 13:59:45 +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
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