Commit Graph

224 Commits

Author SHA1 Message Date
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
Thilo Graf
00b0641465 showFastscanDiseqcSetup: simplify hintbox calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 627098d937
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-20 22:53:53 +01:00
vanhofen
6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +01:00
Jacek Jendrzej
36927c1614 src/gui/scan_setup.cpp fix preselected transponder item
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b640cfa7b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-31 (Mon, 31 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-31 18:23:17 +01:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
Jacek Jendrzej
0c56a98b46 fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f371cc918
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-25 (Mon, 25 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-25 15:41:06 +02:00
Stefan Seyfried
8b28e6737f zapit/debug: remove filename hack with a more elegant one
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ee9ca5471
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-10 18:33:27 +01:00
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
[CST] Focus
5a6d441f33 gui/scan_setup.cpp: do not auto-enable auto-fastscan update after fast scan,
do not auto-enable persistent channels numbers if scan logical channel numbers enabled,
show start fastscan in easy menu mode, too


Origin commit data
------------------
Branch: ni/coolstream
Commit: 978d2d3ef5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)



------------------
This commit was generated by Migit
2015-09-24 12:28:54 +03:00
vanhofen
f26b53d4ad start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Branch: ni/coolstream
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int

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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02: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
c799b55d7d zapit, GUI: allow building with older DVB API version
the new API features are not yet used, so allow building with older API
version e.g. on stlinux where the kernel is too old


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a5fe02149
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)



------------------
This commit was generated by Migit
2015-01-27 21:18:45 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +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
[CST] Focus
33348df25f gui/scan_setup.cpp: add pilot param to manual scan menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34691a1724
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-18 17:31:55 +03:00
Janus
0429f6465e add CBouquetManager writenames menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93d62fd11a
Author: Janus <janus@debian>
Date: 2014-11-03 (Mon, 03 Nov 2014)

Origin message was:
------------------
-add CBouquetManager writenames menu

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

------------------
This commit was generated by Migit
2014-11-03 14:16:53 +01:00
[CST] Focus
516550e2d8 gui/scan_setup.cpp: in easeymenu mode, not allow start fastscan direct, without auto-diseqc configuration
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60b1664057
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-23 (Thu, 23 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-23 18:20:22 +04: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
336c8e97da remove deprecated FEC_S2_XXX;
zapit/src/transponder.cpp: fix missed modulation/delsys in compare(), in dump, show real delsys values;
zapit/src/getservices.cpp: fix satellite frequency, remove deprecated fec convert;
gui/scan_setup.cpp: fix missed modulation/delsys params update;
gui/scan.cpp: add missed modulation scan parameter


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ab885699c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:14:38 +04:00
[CST] Bas
478c7fba32 split fec to fec/modulation/delivery system;
switch to new dvb-api headers;
improve dvb-t manual scan


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:14:33 +04:00
Michael Liebmann
bd9a4f50b6 Rework display LOCALE_SERVICEMENU_RELOAD_HINT message
- remove the very short visible message in channelsInit()
- remove global reloadhintBox

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8eab1ca472
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-07-26 (Sat, 26 Jul 2014)



------------------
This commit was generated by Migit
2014-08-26 17:27:02 +04:00
[CST] Focus
5ee14dabdd merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:25 +04:00
[CST] Focus
0b0bc4e62d gui/scan_setup.cpp: add signal test menu on request
Origin commit data
------------------
Branch: ni/coolstream
Commit: 629528908b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)


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

------------------
This commit was generated by Migit
2014-07-02 11:10:40 +04:00
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
Stefan Seyfried
ca370a6f2b scan_setup: fix build without ENABLE_FASTSCAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: b53c1d1bd6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


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

------------------
This commit was generated by Migit
2014-05-05 12:56:16 +02:00
Stefan Seyfried
ccf8001cde scan_setup: fix build without ENABLE_FASTSCAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94eee5fe49
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-27 19:33:03 +02: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
2dd049be47 gui/scan_setup.cpp: set diseqc options only for satellite frontend
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d3b0b021b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-22 (Tue, 22 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-22 13:37:05 +04:00
[CST] Focus
431d402526 gui/scan_setup.cpp: add explicit option to enable/disable fast-scan update
Origin commit data
------------------
Branch: ni/coolstream
Commit: b925988afe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-07 (Mon, 07 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-14 14:18:32 +04:00
[CST] Focus
cc0dd848d3 gui/scan_setup.cpp: save FST version after scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14d4ffa28f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-02 (Wed, 02 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-02 17:32:58 +04:00
[CST] Focus
7092645b4b gui/scan_setup.cpp: add dynamic diseqc options switch based on frontend mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfc30ae53e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-21 17:18:26 +04:00
[CST] Focus
04ddc607ad gui/scan_setup.cpp: add fast-scan operators, add fast-scan diseqc auto-config and menu to change diseqc
Origin commit data
------------------
Branch: ni/coolstream
Commit: acffe8024d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-20 (Thu, 20 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-21 17:18:06 +04:00
[CST] Focus
f68cccaebf gui/scan_setup.cpp: move rotor options to its own menus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7682d58070
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-06 16:09:10 +04:00
[CST] Focus
630f1017ab gui/scan_setup.cpp, gui/motorcontrol.cpp: use per frontend rotor swap option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 929eb86760
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-06 16:09:09 +04:00
[CST] Focus
28849f2589 gui/scan_setup.cpp: fix DVB-T frontend labels
Origin commit data
------------------
Branch: ni/coolstream
Commit: a26af0104b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-19 (Wed, 19 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-28 13:44:23 +04:00
Stefan Seyfried
bdbf01d0cb scansetup: add DVB-T
Conflicts:
	src/gui/scan_setup.cpp
	src/gui/scan_setup.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a4f65302e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)



------------------
This commit was generated by Migit
2014-02-28 13:44:22 +04:00
Stefan Seyfried
5b2aa4c0be add basic support for DVB-T
This needs more fine tuning wrt scan setup etc, but should work for now.

Conflicts:
	data/Makefile.am
	data/locale/english.locale
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/getservices.h
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f4c1b986c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)



------------------
This commit was generated by Migit
2014-02-28 13:44:22 +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
ae8cfd7dc2 adapt ShowHint handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint 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:11:52 +01:00
Michael Liebmann
2fd195d66a Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


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

Origin message was:
------------------
Preparing the input classes for Lua

- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:38 +01:00
Michael Liebmann
a46c558669 CScanSettings: convert char[...] configuration values to std::string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-19 20:57:38 +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
19cb443dec Merge remote-tracking branch 'check/next-cc'
Conflicts:
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2014-01-19 13:37:24 +01:00
Jacek Jendrzej
81ec9a0e26 remove CURRENTSERVICES_XML after reload channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b40b61c9a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
 remove CURRENTSERVICES_XML after reload channels

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

------------------
This commit was generated by Migit
2014-01-18 21:02:23 +01:00
Stefan Seyfried
402d13aa4d Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-12 14:41:44 +01:00
[CST] Focus
bbdde60688 gui/scan_setup.cpp: fix separator between sat and cable scan option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 468a8df8f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2014-01-08 16:11:18 +04: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
[CST] Focus
0087a5bbe6 gui/scan_setup.cpp: fix tune timeout: value is in 1/10 sec (100ms)
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0afda1c11
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-23 (Mon, 23 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-23 19:53:32 +04:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


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



------------------
This commit was generated by Migit
2013-12-22 21:25:05 +01:00
martii
70757cd44e gui/scan_setup: use locale when displaying seconds
Origin commit data
------------------
Branch: ni/coolstream
Commit: b69bdc38d9
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-22 16:36:13 +01:00