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
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +01:00
vanhofen
243c31f410 NI-yWeb: fix missing %(WEBTVDIR) replacement 
Origin commit data
------------------
Commit: 29dff2d772
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-26 (Thu, 26 Jan 2017)

Origin message was:
------------------
- NI-yWeb: fix missing %(WEBTVDIR) replacement
 2017-01-26 21:36:14 +01:00
vanhofen
7fa810e183 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)
 2017-01-25 21:02:22 +01:00
Michael Liebmann
5d96f62893 Remove obsolete 'contrast_fonts' code from osd menu 
Origin commit data
------------------
Commit: c741d46b63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-25 16:33:45 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
 2017-01-22 22:59:39 +01:00
vanhofen
9f8048b3d1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
 2017-01-13 13:27:49 +01:00
vanhofen
9633f60a76 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fb15ce96de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)
 2017-01-12 13:05:31 +01:00
Andrej Tobola
66e0281beb Update slovak.locale 
Origin commit data
------------------
Commit: adcc5c4285
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)
 2017-01-11 08:24:02 +01:00
Andrej Tobola
efa0ace74f Update slovak.locale 
Origin commit data
------------------
Commit: c4679651f4
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)
 2017-01-11 08:00:28 +01:00
Andrej Tobola
6f985bbb6b Update slovak.locale 
New update, is it submitted in correct way?

Origin commit data
------------------
Commit: 5791e32803
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)
 2017-01-11 07:44:52 +01:00
Marc Szymkowiak
7741cb2a3e add entry to load saved epg data manual 
Origin commit data
------------------
Commit: 9b2a0d4414
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2017-01-09 (Mon, 09 Jan 2017)
 2017-01-09 19:39:30 +01:00
vanhofen
3dc4dc7457 themes: better visibility for progressbars 
Origin commit data
------------------
Commit: 251632ddf0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)

Origin message was:
------------------
- themes: better visibility for progressbars
 2017-01-05 23:42:23 +01:00
vanhofen
e012f6b3f5 icons: better visibility for some icons 
Origin commit data
------------------
Commit: 4955b4e342
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)

Origin message was:
------------------
- icons: better visibility for some icons
 2017-01-05 23:07:58 +01:00
vanhofen
edb884e756 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
 2017-01-05 23:07:16 +01:00
vanhofen
e06b70466a locale: update slovak; thx to Pr0metheus 
Origin commit data
------------------
Commit: 98ab8a083e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus
 2017-01-05 08:42:14 +01:00
vanhofen
8c27915df5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
 2017-01-02 23:55:23 +01:00
vanhofen
e5df342b4f icons: rework channel-status icons 
Origin commit data
------------------
Commit: bb11520528
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- icons: rework channel-status icons
 2017-01-02 23:54:36 +01:00
vanhofen
9eb559aa8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
 2016-12-30 21:54:46 +01:00
vanhofen
178ab117c3 locale: fix funny typo XD 
Origin commit data
------------------
Commit: f8e2df8ac7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)

Origin message was:
------------------
- locale: fix funny typo XD
 2016-12-30 21:51:57 +01:00
Thilo Graf
1087e8fc7d locales: add locales for buttontext settings 
supplement to: 0bf74271652982ff69f378589ee3b8409dce003f


Origin commit data
------------------
Commit: 4b4c295289
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-30 20:33:26 +01:00
vanhofen
cf0d3a8420 icons: small changes as suggested by NI-Team 
Origin commit data
------------------
Commit: fc7b7f143f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- icons: small changes as suggested by NI-Team
 2016-12-29 16:32:57 +01:00
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 15:15:34 +01:00
vanhofen
593d055419 themes: upgrade our themes 
Origin commit data
------------------
Commit: bc42083042
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: upgrade our themes
 2016-12-29 01:13:59 +01:00
FlatTV
957eeba74f Add adulterated orange theme 
Origin commit data
------------------
Commit: 6832d3ad0e
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
 2016-12-26 15:00:19 +01:00
FlatTV
c9624a74ec OSD Menu: Add progressbar color 
Origin commit data
------------------
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
 2016-12-26 14:58:51 +01:00
vanhofen
0da8ea3928 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 41c29a4210
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-24 (Sat, 24 Dec 2016)
 2016-12-24 00:29:03 +01:00
vanhofen
66c48cc1de NI-yWeb: small whitespace cleanup 
Origin commit data
------------------
Commit: c9e5fa36af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NI-yWeb: small whitespace cleanup
 2016-12-23 23:45:06 +01:00
vanhofen
78f106b53a NIyWeb: fix display of imageinfo ... 
and disable online check; needs several fixes


Origin commit data
------------------
Commit: 477c394f29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NIyWeb: fix display of imageinfo ...

and disable online check; needs several fixes
 2016-12-23 23:40:24 +01:00
Marc Szymkowiak
3ff0191b20 fix link to developer forum 
Origin commit data
------------------
Commit: 4417732462
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-12-23 (Fri, 23 Dec 2016)
 2016-12-23 14:12:46 +01:00
vanhofen
cf7fc39a1a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
 2016-12-19 17:23:28 +01:00
vanhofen
a79b90eb81 icons: add and use pictureviewer icon 
Origin commit data
------------------
Commit: a19a5df9ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- icons: add and use pictureviewer icon
 2016-12-19 17:21:51 +01:00
vanhofen
0a8cf7bcc1 personalize: pluralize 'usermenu' item; these are 'usermenus' 
Origin commit data
------------------
Commit: 2e6ee0c3fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- personalize: pluralize 'usermenu' item; these are 'usermenus'
 2016-12-19 17:21:51 +01:00
vanhofen
1847b82611 personalize: pluralize 'usermenu' item; these are 'usermenus' 
Origin commit data
------------------
Commit: 8faaec552a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-18 (Sun, 18 Dec 2016)

Origin message was:
------------------
- personalize: pluralize 'usermenu' item; these are 'usermenus'
 2016-12-18 22:20:12 +01:00
vanhofen
b05f7c1df1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2e1aa8d0d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)
 2016-12-16 23:18:57 +01:00
vanhofen
a35975a3ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a1ed6bb721
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)
 2016-12-16 22:38:01 +01:00
vanhofen
e6b0d8104d locale: right names for timerlist repeat-hints 
Origin commit data
------------------
Commit: 4fc60600f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)

Origin message was:
------------------
- locale: right names for timerlist repeat-hints
 2016-12-16 20:32:09 +01:00
vanhofen
da7d049c52 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 1c47a38c87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 15:06:21 +01:00
vanhofen
5c391a82b8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 14:12:33 +01:00
vanhofen
0a874ca762 yWeb: move data from /src to /data 
Origin commit data
------------------
Commit: 29847283ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)

Origin message was:
------------------
- yWeb: move data from /src to /data
 2016-12-15 14:00:45 +01:00
vanhofen
56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 11:49:05 +01:00
vanhofen
474f18bb13 usermenu: allow testmenu in usermenu 
Origin commit data
------------------
Commit: 7fcf19b967
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- usermenu: allow testmenu in usermenu
 2016-12-12 20:35:29 +01:00
vanhofen
064067285a add our new "Material-Design" icons 
Origin commit data
------------------
Commit: 845aba1cbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- add our new "Material-Design" icons
 2016-12-12 13:13:30 +01:00
vanhofen
35bda9930e iconsets: rename pkg0-iconset to "Material-Design" 
Origin commit data
------------------
Commit: 5a60150076
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- iconsets: rename pkg0-iconset to "Material-Design"
 2016-12-12 12:21:40 +01:00
vanhofen
984b4378c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 3ead60b3fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 12:35:53 +01:00
vanhofen
c29c3fc07f fix last commit 
Origin commit data
------------------
Commit: 9bcdd3487a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- fix last commit
 2016-12-07 11:24:30 +01:00
vanhofen
b50cceee20 icons: move NI icons into categorized subdirectories 
Origin commit data
------------------
Commit: 7ada0f42ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move NI icons into categorized subdirectories
 2016-12-07 11:14:14 +01:00
vanhofen
7e0aeb835f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/Makefile.am
	data/icons/Makefile.am


Origin commit data
------------------
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
 2016-12-07 10:55:25 +01:00
vanhofen
d2f4ae06e2 icons: move icons into categorized subdirectories 
Origin commit data
------------------
Commit: d5ca9aa0bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)

Origin message was:
------------------
- icons: move icons into categorized subdirectories
 2016-12-07 10:36:47 +01:00
vanhofen
73ca7cf0c8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 20:46:37 +01:00
vanhofen
5892f863e5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
 2016-12-06 13:02:25 +01:00