Commit Graph

1956 Commits

Author SHA1 Message Date
vanhofen
ffcc694393 deutsch.locale: adjust EPGPlus.remind
Origin commit data
------------------
Commit: 17ea8e7d63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
2017-09-30 13:18:12 +02:00
vanhofen
efe62f6905 deutsch.locale: adjust EPGPlus.remind
Origin commit data
------------------
Commit: 081ac08d86
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-30 (Sat, 30 Sep 2017)

Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
2017-09-30 10:13:52 +02:00
vanhofen
0d9a80486a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:36:34 +02:00
Stefan Seyfried
3c6d8b4f5c radio-stations.xml: add some Radio BOB! streams
Origin commit data
------------------
Commit: d07e45166e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:52 +02:00
Stefan Seyfried
059c5107fb radio-stations.xml: clean out nonworking entries
Remove all entries that give plain 404 errors or where the host
name cannot be resolved.
Left in some where the playlist url redirects to unreachable hosts
because that might be a temporary failure.


Origin commit data
------------------
Commit: c3b5af06a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:52 +02:00
vanhofen
5c12837f35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 21:53:44 +02:00
Jacek Jendrzej
ebb4b89d93 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 13:26:53 +02:00
vanhofen
5c5b4f4b0a 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/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 13:01:20 +02:00
Jacek Jendrzej
6a908d7228 remove unused locale
Origin commit data
------------------
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 12:53:03 +02:00
Jacek Jendrzej
678fa9560f Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 20:44:49 +02:00
vanhofen
c846cceba5 icons: rename slider icons to more logical names
Origin commit data
------------------
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names
2017-09-15 20:18:26 +02:00
vanhofen
1af6786518 icons: new slider icons with material colors
Origin commit data
------------------
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors
2017-09-15 20:17:07 +02:00
vanhofen
b6d05461a8 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints
2017-09-15 16:34:23 +02:00
vanhofen
4867526810 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: b4701fdcb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 12:53:19 +02:00
vanhofen
da3d2db042 keychooser: strip unneeded code; use hintbox instead of handcrafted paints
Origin commit data
------------------
Commit: 04c1cbe15e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)

Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints
2017-09-15 12:41:06 +02:00
vanhofen
fe16fc9f1d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: b72cda244d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 22:02:00 +02:00
vanhofen
0ecc03b4c9 icons: rename slider icons to more logical names
Origin commit data
------------------
Commit: b00caf1c31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: rename slider icons to more logical names
2017-09-14 22:00:41 +02:00
vanhofen
8d9030f1f4 icons: new slider icons with material colors
Origin commit data
------------------
Commit: 0b09d125fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- icons: new slider icons with material colors
2017-09-14 21:37:44 +02:00
Jacek Jendrzej
805ed42dc4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:54:04 +02:00
vanhofen
e66aaeca77 get sure we have the logo-dir, even if it's empty
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 2ace914324
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

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
9299fe4fb7 locale: small changes; unify save/load locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 76fafe584d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- locale: small changes; unify save/load locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
23713174bc yWeb: align cifs-mounts to new automount-syntax
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4097d07942
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
7c822ed2ca y-web: show hostname as page-title
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: c06e5e114a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: show hostname as page-title

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
481d3d7017 y-web: remove white background from favicon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5477bed480
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: remove white background from favicon

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
dd2db83543 locale: small changes in update locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9112e85cd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
Jacek Jendrzej
ecf78ec322 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 15:53:42 +02:00
vanhofen
ea1be5ae2a rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Commit: d23323758c
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 15:52:19 +02:00
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