Commit Graph

1223 Commits

Author SHA1 Message Date
vanhofen
e67e33d323 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
2017-02-13 23:29:07 +01:00
vanhofen
315955cc0d 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
------------------
Branch: ni/coolstream
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
2017-02-13 21:41:04 +01:00
Michael Liebmann
3903507312 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
------------------
Branch: ni/coolstream
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)


------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
vanhofen
afda007d95 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
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
b9b5808928 NI-code: Rename hardware defined macros for coolstream stb
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-02-12 21:57:06 +01:00
vanhofen
4ac4e963ad 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
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
e8b36a1d80 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +01:00
Michael Liebmann
73076ba2cb Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6803a8dff3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-31 16:36:40 +01:00
vanhofen
d9a8d365f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:32:04 +01:00
vanhofen
760922196e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



------------------
This commit was generated by Migit
2017-01-29 21:30:01 +01:00
Michael Liebmann
29063d58a8 install.sh: Preserve symlinks at update
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcf478ba67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-29 (Sun, 29 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-29 04:31:12 +01:00
vanhofen
f70f7df777 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-27 18:49:24 +01:00
vanhofen
c258f39d4e NI-yWeb: fix missing %(WEBTVDIR) replacement
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29dff2d772
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-26 (Thu, 26 Jan 2017)

Origin message was:
------------------
- NI-yWeb: fix missing %(WEBTVDIR) replacement

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

------------------
This commit was generated by Migit
2017-01-26 21:36:14 +01:00
vanhofen
37030339ad Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 21:02:22 +01:00
Michael Liebmann
a71c444da3 Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c741d46b63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-25 16:33:45 +01:00
vanhofen
6df0618eec Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-13 13:27:49 +01:00
vanhofen
76ff131c56 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb15ce96de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-12 13:05:31 +01:00
Andrej Tobola
e5f0bf360e Update slovak.locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: adcc5c4285
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)



------------------
This commit was generated by Migit
2017-01-11 08:24:02 +01:00
Andrej Tobola
db8cb9dc91 Update slovak.locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4679651f4
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)



------------------
This commit was generated by Migit
2017-01-11 08:00:28 +01:00
Andrej Tobola
2d54d71c96 Update slovak.locale
New update, is it submitted in correct way?

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5791e32803
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)



------------------
This commit was generated by Migit
2017-01-11 07:44:52 +01:00
Marc Szymkowiak
c54a158059 add entry to load saved epg data manual
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b2a0d4414
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2017-01-09 (Mon, 09 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-09 19:39:30 +01:00
vanhofen
13e8978d73 themes: better visibility for progressbars
Origin commit data
------------------
Branch: ni/coolstream
Commit: 251632ddf0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)

Origin message was:
------------------
- themes: better visibility for progressbars

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

------------------
This commit was generated by Migit
2017-01-05 23:42:23 +01:00
vanhofen
91216b1e2b icons: better visibility for some icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4955b4e342
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)

Origin message was:
------------------
- icons: better visibility for some icons

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

------------------
This commit was generated by Migit
2017-01-05 23:07:58 +01:00
vanhofen
2cd0bbb9f1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)



------------------
This commit was generated by Migit
2017-01-05 23:07:16 +01:00
vanhofen
aa9c114201 locale: update slovak; thx to Pr0metheus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98ab8a083e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)

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
2017-01-05 08:42:14 +01:00
vanhofen
f2b271a823 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-02 23:55:23 +01:00
vanhofen
90b59d60d3 icons: rework channel-status icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb11520528
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- icons: rework channel-status icons

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

------------------
This commit was generated by Migit
2017-01-02 23:54:36 +01:00
vanhofen
ab1e072620 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 21:54:46 +01:00
vanhofen
600dfdfc28 locale: fix funny typo XD
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8e2df8ac7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)

Origin message was:
------------------
- locale: fix funny typo XD

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

------------------
This commit was generated by Migit
2016-12-30 21:51:57 +01:00
Thilo Graf
b2ce21b349 locales: add locales for buttontext settings
supplement to: 0bf74271652982ff69f378589ee3b8409dce003f


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b4c295289
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 20:33:26 +01:00
vanhofen
d29073980f icons: small changes as suggested by NI-Team
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-12-29 16:32:57 +01:00
vanhofen
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +01:00
vanhofen
0e90eb549c themes: upgrade our themes
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc42083042
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: upgrade our themes

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

------------------
This commit was generated by Migit
2016-12-29 01:13:59 +01:00
FlatTV
f10e9f7576 Add adulterated orange theme
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6832d3ad0e
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-26 15:00:19 +01:00
FlatTV
902cc57d77 OSD Menu: Add progressbar color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-26 14:58:51 +01:00
vanhofen
27f153c048 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41c29a4210
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-24 (Sat, 24 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-24 00:29:03 +01:00
vanhofen
1b38e15320 NI-yWeb: small whitespace cleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9e5fa36af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-23 (Fri, 23 Dec 2016)

Origin message was:
------------------
- NI-yWeb: small whitespace cleanup

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

------------------
This commit was generated by Migit
2016-12-23 23:45:06 +01:00
vanhofen
b9d92abc00 NIyWeb: fix display of imageinfo ...
and disable online check; needs several fixes


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


------------------
This commit was generated by Migit
2016-12-23 23:40:24 +01:00
Marc Szymkowiak
9ba1fed3ac fix link to developer forum
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4417732462
Author: Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
Date: 2016-12-23 (Fri, 23 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-23 14:12:46 +01:00
vanhofen
5ffe34cea9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-19 17:23:28 +01:00
vanhofen
75fdcc5b1b icons: add and use pictureviewer icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: a19a5df9ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)

Origin message was:
------------------
- icons: add and use pictureviewer icon

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

------------------
This commit was generated by Migit
2016-12-19 17:21:51 +01:00
vanhofen
f96b09926e personalize: pluralize 'usermenu' item; these are 'usermenus'
Origin commit data
------------------
Branch: ni/coolstream
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'

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

------------------
This commit was generated by Migit
2016-12-19 17:21:51 +01:00
vanhofen
f3899ec40c personalize: pluralize 'usermenu' item; these are 'usermenus'
Origin commit data
------------------
Branch: ni/coolstream
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'

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

------------------
This commit was generated by Migit
2016-12-18 22:20:12 +01:00
vanhofen
133edf4688 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e1aa8d0d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-16 23:18:57 +01:00
vanhofen
c0c795ee67 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1ed6bb721
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-16 (Fri, 16 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-16 22:38:01 +01:00
vanhofen
1474434304 locale: right names for timerlist repeat-hints
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-12-16 20:32:09 +01:00
vanhofen
421080e258 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c47a38c87
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 15:06:21 +01:00
vanhofen
42a7ef830b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 14:12:33 +01:00
vanhofen
8ac19456e1 yWeb: move data from /src to /data
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-12-15 14:00:45 +01:00
vanhofen
36741264b0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



------------------
This commit was generated by Migit
2016-12-15 11:49:05 +01:00