Commit Graph

107 Commits

Author SHA1 Message Date
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Stefan Seyfried
499659677f Merge remote-tracking branch 'test/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-07 20:09:44 +01:00
vanhofen
721b5ebe1e hdd_menu: resort filesystem struct, to get ext4 as default value
Origin commit data
------------------
Branch: ni/coolstream
Commit: b07943807e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-02 (Mon, 02 Mar 2015)

Origin message was:
------------------
- hdd_menu: resort filesystem struct, to get ext4 as default value

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

------------------
This commit was generated by Migit
2015-03-02 12:28:28 +01:00
Stefan Seyfried
fa09f58664 remove useless sync() calls
unless we had serious kernel bugs, those sync() calls
serve no useful purpose


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae21edb141
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)



------------------
This commit was generated by Migit
2015-02-25 21:43:41 +01:00
Stefan Seyfried
8b04d1ba7f hdd_menu: fix device name on fdisk invocation
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1836f497c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-22 18:47:29 +01:00
Stefan Seyfried
db59406f42 hdd_menu: use realpath(3) instead of calling system("readlink")
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8066b5a3e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-10 14:11:20 +01:00
[CST] Focus
d55b0c3bf9 Revert "hdd_menu: only offer filesystems with kernel support"
- breaks user-space fs like exfat

This reverts commit bb5fbb9954.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d287e46f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)



------------------
This commit was generated by Migit
2015-02-10 15:07:28 +03:00
[CST] Focus
8d073853d2 Revert "hdd_menu: fix is_mounted for device links"
- broken in case readlink do not support -f switch -> filesystem always 'mounted'

This reverts commit 47f2cfd410.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 990e79aa6f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)



------------------
This commit was generated by Migit
2015-02-10 15:05:05 +03:00
[CST] Focus
9423a68853 Revert "hdd_menu: do not handle the rootfs or fs without kernel support"
This reverts commit 1a4ac8b281.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 342180a28b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-10 (Tue, 10 Feb 2015)



------------------
This commit was generated by Migit
2015-02-10 15:04:52 +03:00
Stefan Seyfried
9c0f9cf720 hdd_menu: my_popen() needs waitpid to avoid zombies
Origin commit data
------------------
Branch: ni/coolstream
Commit: d411f6d996
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
1a4ac8b281 hdd_menu: do not handle the rootfs or fs without kernel support
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7bb7a70cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
47f2cfd410 hdd_menu: fix is_mounted for device links
It is possible to mount e.g. '/dev/disk/by-label/ext_drive', but
is_mounted did not handle this case. Fix that.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 415e7351e1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)



------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
e0bcd5bddd hdd_menu: also recognize recordingdir if it is a symlink
...like "/media/by-label/foo/movies", no need to reset configuration
in that case


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17395a7fed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)



------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
bb5fbb9954 hdd_menu: only offer filesystems with kernel support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 141872565e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
d1f2fce774 mdev_helper/hdd_menu: add udev support
busybox/mdev fills the MDEV variable without /dev/ prefix,
udev fills DEVNAME with /dev/ prefix. Handle both variants.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d04f7406a7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
758256cbfc hdd_menu: do not handle the rootfs or fs without kernel support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4675f403a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-08 15:22:15 +01:00
Stefan Seyfried
d12cdc0d42 hdd_menu: fix is_mounted for device links
It is possible to mount e.g. '/dev/disk/by-label/ext_drive', but
is_mounted did not handle this case. Fix that.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33730236d6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)



------------------
This commit was generated by Migit
2015-02-08 15:11:37 +01:00
Stefan Seyfried
fdd7beea63 hdd_menu: also recognize recordingdir if it is a symlink
...like "/media/by-label/foo/movies", no need to reset configuration
in that case


Origin commit data
------------------
Branch: ni/coolstream
Commit: b3c82180a5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)



------------------
This commit was generated by Migit
2015-02-08 13:07:51 +01:00
Stefan Seyfried
3c8d63ebe2 hdd_menu: only offer filesystems with kernel support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 619e2a0234
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-08 12:27:03 +01:00
Stefan Seyfried
1f6851dea7 hdd_menu: my_popen() needs waitpid to avoid zombies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67bd1738a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-08 (Sun, 08 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-08 00:55:44 +01:00
Stefan Seyfried
1b7d3b8e8d mdev_helper/hdd_menu: add udev support
busybox/mdev fills the MDEV variable without /dev/ prefix,
udev fills DEVNAME with /dev/ prefix. Handle both variants.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48d3e45eb7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-07 21:38:33 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
martii
99f9745c97 drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
[CST] Focus
5b33660ea7 gui/hdd_menu.cpp: prevent divide by zero
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b697fb52b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-12 (Fri, 12 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-12 11:35:58 +04:00
[CST] Focus
3da726560d gui/hdd_menu.cpp: ask to set recording path after mount (hotplug or format)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05558331f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-30 (Fri, 30 May 2014)


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

------------------
This commit was generated by Migit
2014-05-30 14:57:17 +04:00
Jacek Jendrzej
0b2a9b580f src/gui/hdd_menu.cpp: remove '\n' for all msg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8acad336ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-05-10 (Sat, 10 May 2014)

Origin message was:
------------------
src/gui/hdd_menu.cpp: remove '\n' for all msg

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

------------------
This commit was generated by Migit
2014-05-10 19:25:59 +02:00
[CST] Focus
cab1cb8912 gui/hdd_menu.cpp: add question to set record directory to formatted drive;
mark partition used for recording with icon, disable umount


Origin commit data
------------------
Branch: ni/coolstream
Commit: bbcd7330a8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-01 (Thu, 01 May 2014)



------------------
This commit was generated by Migit
2014-05-01 19:03:09 +04:00
[CST] Focus
aafd87fd46 gui/hdd_menu.cpp: add question and show format menu, if plugged device not mounted
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55167990b5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-30 17:15:25 +04:00
[CST] Focus
c679db64e1 gui/hdd_menu.cpp: add mount point mkdir, if mdev not used
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea9e950fd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-29 (Tue, 29 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-29 13:44:50 +04:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
[CST] Focus
f3ebe06962 gui/hdd_menu.cpp: convert to singleton;
add basic notify about device hotplug/remove


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6be2b32cd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)



------------------
This commit was generated by Migit
2014-04-23 17:44:24 +04:00
[CST] Focus
ad272b77e2 gui/hdd_menu.cpp: fix menu, if format canceled;
add xfs tools;
change progress messages to commands executed

Conflicts:
	src/gui/hdd_menu.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9257d21c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-15 (Tue, 15 Apr 2014)



------------------
This commit was generated by Migit
2014-04-16 18:12:50 +04:00
Jacek Jendrzej
a0bb026e7a compil fix withot mdev
Origin commit data
------------------
Branch: ni/coolstream
Commit: b58e9b612c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-15 (Tue, 15 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-15 15:57:20 +02:00
[CST] Focus
4a49cb8bbf gui/hdd_menu.cpp: rework HDD menu, add device mount/umount,
add support for mmc and DVD/BD devices, make easy to add other filesystems mkfs/fsck,
parts based on code (C) martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: 37fb9ddc87
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-14 (Mon, 14 Apr 2014)



------------------
This commit was generated by Migit
2014-04-14 14:19:09 +04:00
vanhofen
6f8dc17343 hdd_menu: fix hdd_sleep 'off'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea89eae41e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-06 (Thu, 06 Mar 2014)

Origin message was:
------------------
- hdd_menu: fix hdd_sleep 'off'

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

------------------
This commit was generated by Migit
2014-03-06 09:59:18 +01:00
Stefan Seyfried
57f2ffddbd hdd_menu: better error message
...when trying to check unsupported file system type


Origin commit data
------------------
Branch: ni/coolstream
Commit: 64a61f5aa2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
2014-03-01 21:17:11 +01:00
Stefan Seyfried
c939ed5a0e hdd_menu: improve error resilience in getFmtType()
Origin commit data
------------------
Branch: ni/coolstream
Commit: a25bc90d7b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-01 21:16:29 +01:00
Stefan Seyfried
1dca2e2551 hdd_menu: improve error resilience in getFmtType()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f09cf0a2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-23 17:58:06 +01:00
Stefan Seyfried
cf38d5229f hdd_menu: better error message
...when trying to check unsupported file system type


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0daee84364
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
2014-02-23 17:57:02 +01:00
Stefan Seyfried
f9096e3e2b hdd_menu: don't hardcode tool paths
use find_executable() instead of hardcoding the paths to
mkfs, fsck and blkid


Origin commit data
------------------
Branch: ni/coolstream
Commit: 961ba97e9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
2014-02-23 17:26:13 +01:00
Stefan Seyfried
ea7cb97893 Merge remote-tracking branch 'check/next-cc'
broken, needs buildfixing


Origin commit data
------------------
Branch: ni/coolstream
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
2014-02-23 15:17:48 +01:00
Michael Liebmann
3805a76157 hddmenu: Support ext4 for formating disk
- Support ext4 for formating disk (require /sbin/mkfs.ext4)
- Support ext4 for check disk (require /sbin/fsck.ext4 or /sbin/e2fsck)
- Display disk format in menu (require /sbin/blkid)
- 'ext4' and 'display disk format' disabled when required files not present


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c5d29a687
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)



------------------
This commit was generated by Migit
2014-02-21 00:02:46 +01:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
martii
bf8eccec62 gui/hdd_menu: correct option count
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6895281091
Author: martii <m4rtii@gmx.de>
Date: 2014-02-12 (Wed, 12 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-12 21:06:18 +01:00
[CST] Focus
b6ad82bf2b gui/hdd_menu.cpp: disable 1min sleep option;
fix restore hotplug for mdev system


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8020de8bfe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)



------------------
This commit was generated by Migit
2014-02-12 16:47:28 +04:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp

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

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00