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

1229 Commits

Author SHA1 Message Date
vanhofen
9f3dad285f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 10:38:14 +01:00
vanhofen
e714a2ae52 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 18:18:07 +01:00
vanhofen
66b44f2a0f flashtool: localize getType() function 
Origin commit data
------------------
Commit: 950f74dd41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- flashtool: localize getType() function
 2017-03-01 18:16:09 +01:00
vanhofen
a360c99a70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:10:36 +01:00
vanhofen
260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:09:50 +01:00
vanhofen
8e36032281 yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup 
Origin commit data
------------------
Commit: 5edc857122
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
 2017-03-01 11:51:25 +01:00
vanhofen
ca916b849c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 23:29:07 +01:00
vanhofen
8704cb914a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 21:41:04 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware 
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
 2017-02-13 12:51:14 +01:00
vanhofen
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
vanhofen
e97d93f824 NI-code: Rename hardware defined macros for coolstream stb 
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
 2017-02-12 21:57:06 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +01:00
Michael Liebmann
61ccbe74d9 configure: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 configure parameter: --with-boxmodel=hd1
 --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 configure parameter: --with-boxmodel=hd2
 --with-boxmodel=apollo is deprecated, but still valid


Origin commit data
------------------
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
  configure parameter: --with-boxmodel=hd1
  --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
  configure parameter: --with-boxmodel=hd2
  --with-boxmodel=apollo is deprecated, but still valid
 2017-02-12 09:21:04 +01:00
Michael Liebmann
a4326eaf79 Remove obsolete 'contrast_fonts' code from osd menu 
Origin commit data
------------------
Commit: 6803a8dff3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
 2017-01-31 16:36:40 +01:00
vanhofen
b0faca6cc0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:32:04 +01:00
vanhofen
ae640b35c1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:30:01 +01:00
Michael Liebmann
61da024d6b install.sh: Preserve symlinks at update 
Origin commit data
------------------
Commit: bcf478ba67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 04:31:12 +01:00
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
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