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

1579 Commits

Author SHA1 Message Date
vanhofen
af919290b2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 15:07:03 +02:00
vanhofen
e7f85aba40 rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code
 2017-09-13 14:46:38 +02:00
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:40:40 +02:00
vanhofen
6310efb007 remove unused nkplay stuff 
Origin commit data
------------------
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:35:23 +02:00
vanhofen
9db42a7d2b drop easymenu 
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-13 13:35:23 +02:00
vanhofen
99455725dc remove unused nkplay stuff 
Origin commit data
------------------
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:09:34 +02:00
vanhofen
f71684c751 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 12:52:23 +02:00
vanhofen
0975ae37ef locale: minor changes; fix typo 
Origin commit data
------------------
Commit: 3742ca7dfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- locale: minor changes; fix typo
 2017-09-13 10:45:23 +02:00
vanhofen
487fa232a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 08:36:25 +02:00
vanhofen
ff21981795 drop easymenu 
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-12 23:46:22 +02:00
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
367977ada4 network-setup: small changes in locales; move npt-at-boot item up 
Origin commit data
------------------
Commit: 92a8ee74f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- network-setup: small changes in locales; move npt-at-boot item up
 2017-09-12 22:30:35 +02:00
vanhofen
8ba3308c23 drop ni-menu 
Origin commit data
------------------
Commit: 7379101512
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop ni-menu
 2017-09-12 22:30:35 +02:00
vanhofen
2de02e1b3f move netfs-mounts from ni-menu to network-setup 
Origin commit data
------------------
Commit: 6c20bc42f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move netfs-mounts from ni-menu to network-setup
 2017-09-12 22:30:35 +02:00
vanhofen
ad03e7a834 move some more stuff from ni-menu to service-menu 
Origin commit data
------------------
Commit: b600bcefa7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some more stuff from ni-menu to service-menu
 2017-09-12 22:30:35 +02:00
vanhofen
8f64981ccf miscsettings_menu: add new submenu for plugins 
Origin commit data
------------------
Commit: 732172aeb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- miscsettings_menu: add new submenu for plugins
 2017-09-12 22:30:35 +02:00
vanhofen
bb8cc1bcbd move infoicons-setup from ni-menu to miscsettings-menu 
Origin commit data
------------------
Commit: 91d2193126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move infoicons-setup from ni-menu to miscsettings-menu
 2017-09-12 22:30:35 +02:00
vanhofen
d3c5f4f73e move daemon-control to own sources; now placed in service-menu 
Origin commit data
------------------
Commit: 0ab71dc962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move daemon-control to own sources; now placed in service-menu
 2017-09-12 22:30:34 +02:00
vanhofen
ebb13b6951 small adds 
Origin commit data
------------------
Commit: 547ad8a491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- small adds
 2017-09-09 15:33:46 +02:00
vanhofen
1544c19e27 settings_manager_teams: small reworks; unify locales 
* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box


Origin commit data
------------------
Commit: 8eb3a61829
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- settings_manager_teams: small reworks; unify locales

* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box
 2017-09-09 11:03:52 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:44:18 +02:00
vanhofen
c17506caec icons: remove leftovers from our old iconsets 
Origin commit data
------------------
Commit: 6c558fd4fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- icons: remove leftovers from our old iconsets
 2017-09-08 21:10:26 +02:00
vanhofen
7650e3e748 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 12:24:32 +02:00
vanhofen
bbd508bb15 get sure we have the logo-dir, even if it's empty 
Origin commit data
------------------
Commit: 5a3bdd47c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- get sure we have the logo-dir, even if it's empty
 2017-09-08 10:53:03 +02:00
vanhofen
4250a45ea5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
 2017-09-07 16:41:06 +02:00
vanhofen
9fd6174d36 locale: small changes; unify save/load locales 
Origin commit data
------------------
Commit: c76b874c70
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- locale: small changes; unify save/load locales
 2017-09-07 16:18:30 +02:00
vanhofen
2123550b64 yWeb: align cifs-mounts to new automount-syntax 
Origin commit data
------------------
Commit: fbb92e23c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax
 2017-09-05 16:53:34 +02:00
vanhofen
d40fe59ed2 icons: fix color of new icon info4_off.png 
Origin commit data
------------------
Commit: 43587b1008
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- icons: fix color of new icon info4_off.png
 2017-09-04 23:23:38 +02:00
vanhofen
abd30071dd add possibility to signalize available online-updates in infoicons 
Origin commit data
------------------
Commit: 3294d9f74d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-04 (Mon, 04 Sep 2017)

Origin message was:
------------------
- add possibility to signalize available online-updates in infoicons
 2017-09-04 17:17:27 +02:00
vanhofen
399f57da55 Makefile.am edited online with Bitbucket 
Origin commit data
------------------
Commit: 631efffab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)
 2017-09-01 17:42:24 +00:00
vanhofen
6fbf667c03 y-web: remove white background from favicon 
Origin commit data
------------------
Commit: f9e32b1b48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: remove white background from favicon
 2017-09-01 12:31:51 +02:00
vanhofen
9ad758f14a y-web: show hostname as page-title 
Origin commit data
------------------
Commit: 5c46967ffb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: show hostname as page-title
 2017-09-01 12:31:51 +02:00
vanhofen
d8de36d425 add some missing icons 
Origin commit data
------------------
Commit: db0eb7c9a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- add some missing icons
 2017-08-31 22:03:32 +02:00
vanhofen
5eb5a6c88f icons: don't install unused flag-icons 
Origin commit data
------------------
Commit: 63991e065d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- icons: don't install unused flag-icons
 2017-08-31 15:43:34 +02:00
vanhofen
c02162a404 webtv: update filmon.xml 
Origin commit data
------------------
Commit: 1a08c91eb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- webtv: update filmon.xml
 2017-08-31 15:12:58 +02:00
vanhofen
cd50be6042 add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start 
Origin commit data
------------------
Commit: 7a1aeb3038
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start
 2017-08-31 08:59:06 +02:00
vanhofen
b15f91ff97 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 79162ebf6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
 2017-08-30 18:12:10 +02:00
vanhofen
a39aa78a4c locale: small changes in update locales 
Origin commit data
------------------
Commit: f1393b5bd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales
 2017-08-29 14:38:26 +02:00
vanhofen
284426853d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:52 +02:00
vanhofen
e87210b1d2 remove possibility to change iconsets for infoviewer 
Origin commit data
------------------
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer
 2017-08-26 10:19:37 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +02:00
vanhofen
b63172033c re-sort locals 
Origin commit data
------------------
Commit: fddd6bbd5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-18 (Fri, 18 Aug 2017)

Origin message was:
------------------
- re-sort locals
 2017-08-18 08:21:01 +02:00
vanhofen
144f0754e0 clearify headers for ausioplayer/internetradio setup 
Origin commit data
------------------
Commit: 8314675161
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- clearify headers for ausioplayer/internetradio setup
 2017-08-17 21:49:43 +02:00
vanhofen
378dfeeda6 audioplayer. add streamripper control to record current stream 
Origin commit data
------------------
Commit: 24affa8a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-17 (Thu, 17 Aug 2017)

Origin message was:
------------------
- audioplayer. add streamripper control to record current stream
 2017-08-17 21:13:19 +02:00
vanhofen
9a69091b0d themes: add new shadow-color to our material themes 
Origin commit data
------------------
Commit: 88d34a3e0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)

Origin message was:
------------------
- themes: add new shadow-color to our material themes
 2017-08-12 13:51:00 +02:00
vanhofen
b327436c94 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
 2017-08-09 10:37:47 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 20:06:40 +02:00
vanhofen
bdd2d9ae3f english.locale: fix typo 
Origin commit data
------------------
Commit: 342d46d5c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)

Origin message was:
------------------
- english.locale: fix typo
 2017-08-08 16:41:57 +02:00
vanhofen
91c7d7ef9c Partly revert "english.locale: corrections in channellist locales" 
This partly reverts commit 22fdfc0484.

Conflicts:
	data/locale/english.locale


Origin commit data
------------------
Commit: 3b05300d59
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 16:41:08 +02:00
vanhofen
a0f5a94440 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 15:54:12 +02:00