mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-17 10:23:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,398 Commits 2 Branches 9 Tags
2c76238007c78d44c01a9a7e6ef2e401f90f7cb8
Commit Graph

94 Commits

Author SHA1 Message Date
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
vanhofen
e6564a4f2a controlapi/yparser: detect new models tank and trinity 
Origin commit data
------------------
Commit: efe212413b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-15 (Thu, 15 Aug 2013)

Origin message was:
------------------
- controlapi/yparser: detect new models tank and trinity
 2013-08-15 16:25:38 +02:00
vanhofen
bec445b476 yweb: add PCR PID handling to live streaming ... 
... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git


Origin commit data
------------------
Commit: ff161a699c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-09 (Fri, 09 Aug 2013)

Origin message was:
------------------
- yweb: add PCR PID handling to live streaming ...

... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git
 2013-08-09 11:04:26 +02:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
vanhofen
74ef42378f yweb: use more matching zee-remotecontrol for neo twin 
Origin commit data
------------------
Commit: aa0920d807
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)

Origin message was:
------------------
- yweb: use more matching zee-remotecontrol for neo twin
 2013-06-13 11:43:40 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
vanhofen
9e790476cb yweb: add key 'sleep' 
Origin commit data
------------------
Commit: ee4a4cbea1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-14 (Tue, 14 May 2013)

Origin message was:
------------------
- yweb: add key 'sleep'
 2013-05-14 22:40:49 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
36c317f2d6 nhttpd: fix streaming with non-standard port 
Origin commit data
------------------
Commit: 5db15cc630
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-08 10:02:33 +04:00
Stefan Seyfried
b620a0b9e1 nhttpd: fix streaming with non-standard port 
Origin commit data
------------------
Commit: 069bf46578
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
 2013-04-06 11:49:47 +02:00
[CST] Focus
f1b2e5cef6 remove 'coolstream' from gui 
Origin commit data
------------------
Commit: cdf10ef46e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-22 (Fri, 22 Mar 2013)
 2013-03-22 10:52:39 +04:00
[CST] Focus
14a1809e79 nhttpd/tuxboxapi/coolstream/controlapi.cpp: create screenshot in sync mode 
Origin commit data
------------------
Commit: 370e3dd690
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)
 2013-03-19 17:24:09 +04:00
Stefan Seyfried
d3531638eb neutrino: fix most hardcoded paths 
Origin commit data
------------------
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
 2013-03-10 02:01:52 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
 2013-02-21 17:07:18 +01:00
[CST] Focus
7371c5154d Merge branch 'dvbsi++' into next 
Origin commit data
------------------
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
 2013-02-13 15:34:41 +04:00
vanhofen
a5c8b89d8b controlapi.cpp: make ScreenshotCGI() more configurable 
Origin commit data
------------------
Commit: 133740da14
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- controlapi.cpp: make ScreenshotCGI() more configurable
 2013-02-12 13:58:21 +01:00
[CST] Bas
953831c2c3 neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths. 
Origin commit data
------------------
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)
 2013-01-25 10:33:40 +08:00
Stefan Seyfried
f2e855b7ef neutrino: enable screenshots 
Origin commit data
------------------
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 18:49:37 +01:00
Stefan Seyfried
398f17e65a Merge branch 'uncool/dvbsi++' commit d7a2395633 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)
 2013-01-03 09:46:11 +01:00
Gaucho316
181781a12a nhttpd: don't decode URL parameters multiple times 
Origin commit data
------------------
Commit: 1b4ad51d0a
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2012-12-29 (Sat, 29 Dec 2012)
 2012-12-31 07:04:52 +01:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
 2012-12-30 21:35:20 +01:00
Jacek Jendrzej
610ce926f5 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp: add current transponder pchannels list , use: <BOXID>/control/currenttpchannels 
Origin commit data
------------------
Commit: 4965619a79
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-23 (Sun, 23 Dec 2012)
 2012-12-23 19:12:41 +01:00
Jacek Jendrzej
b64c420124 nhttpd: dont doubles decode, revert 506b646c19 
Origin commit data
------------------
Commit: f66b2baedc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-17 (Mon, 17 Dec 2012)
 2012-12-17 22:01:46 +01:00
Jacek Jendrzej
01a52aa8fb supplement to dedad4412e 
Origin commit data
------------------
Commit: b3ddc46e14
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)
 2012-12-08 17:53:01 +01:00
Jacek Jendrzej
dedad4412e yWeb: Timer: dont stop recording after modifying timer - Timer: sets audio-pid correctly - Timer: seconds set to Null 
Origin commit data
------------------
Commit: dc33e93375
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)
 2012-12-08 17:47:25 +01:00
Jacek Jendrzej
9d760b0ac6 src/nhttpd: clean code 
Origin commit data
------------------
Commit: 5e4a541781
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
 2012-11-28 19:03:03 +01:00
Stefan Seyfried
8baeccb8a1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
 2012-11-23 18:45:22 +01:00
vanhofen
7171b58bba yweb: fix remotecontrol; remove dependency from MAC 
Origin commit data
------------------
Commit: 8131a25af1
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-19 (Mon, 19 Nov 2012)

Origin message was:
------------------
- yweb: fix remotecontrol; remove dependency from MAC
 2012-11-19 22:33:50 +01:00
Stefan Seyfried
4c7a4f15cc neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 14:05:48 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 10:45:33 +01:00
Jacek Jendrzej
8568ad231d controlapi.cpp:revert to standard output 
Origin commit data
------------------
Commit: cf1dfdad7c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)
 2012-10-22 21:28:38 +02:00
Jacek Jendrzej
0456a04ded rc_lock: lock for rc_lock, use only once, supplement to 5bc50d70d8 
Origin commit data
------------------
Commit: 9a2d6aea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)

Origin message was:
------------------
rc_lock: lock for rc_lock, use only once, supplement to 5bc50d70d8
 2012-10-22 15:52:07 +02:00
Jacek Jendrzej
5bc50d70d8 nhttpd::controlapi.cpp:execute more comands on/off only once (fix doubleclick) 
Origin commit data
------------------
Commit: 9e3567dc09
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)
 2012-10-22 14:00:01 +02:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3' 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
 2012-10-14 12:51:07 +02:00
[CST] Focus
934e6b8c33 remove channel_id mask for CEitManager getXXX calls 
Origin commit data
------------------
Commit: 3f5a0e5bb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
 2012-08-30 14:50:01 +04:00
[CST] Focus
8ec523e8cc use CEitManager to get EIT data 
Origin commit data
------------------
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
 2012-08-30 11:40:02 +04:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
 2012-07-23 01:02:29 +02:00
Jacek Jendrzej
18a471d92b use empty() instead of size() 
Origin commit data
------------------
Commit: c1a1aae4c1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
 2012-06-16 10:38:38 +02:00
Jacek Jendrzej
67903dc13b use empty() instead of size() 
Origin commit data
------------------
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
 2012-06-16 09:44:42 +02:00
Jacek Jendrzej
173a960c4a never used values 
Origin commit data
------------------
Commit: e023548008
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
 2012-05-08 15:49:36 +02:00
[CST] Focus
c0df2f7ce3 comment some found not used variables 
Origin commit data
------------------
Commit: 8e06495776
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
 2012-05-08 16:18:16 +04:00
Jacek Jendrzej
04be37cf14 performance Prefer prefix ++/-- operators for non-primitive types. 
Origin commit data
------------------
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)
 2012-04-28 10:56:27 +02:00
[CST] Focus
2b25a8b793 nhttpd/tuxboxapi/coolstream/controlapi.cpp: replace Zapit->isChannelTVChannel() with CServiceManager IsChannelTVChannel() 
Origin commit data
------------------
Commit: 886ebdb146
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-18 (Wed, 18 Apr 2012)
 2012-04-18 19:02:06 +04:00
Stefan Seyfried
d20222f101 nhttpd/controlapi: don't build incompatibly licensed code 
Origin commit data
------------------
Commit: dce95336a3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-14 (Sat, 14 Apr 2012)
 2012-04-17 19:33:59 +02:00
[CST] Bas
d3dd55a6e0 Merge branch 'dvbsi++' of 109.75.98.228:cst-private-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: cac6486202
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-13 (Fri, 13 Apr 2012)
 2012-04-13 16:24:56 +08:00
[CST] Bas
c58e9063c8 Merge branch 'master' into dvbsi++ 
Conflicts:
	src/zapit/include/zapit/zapit.h


Origin commit data
------------------
Commit: 86dbdde70d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-12 (Thu, 12 Apr 2012)
 2012-04-13 04:55:55 +08:00
[CST] Focus
e0cfac62a6 rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID 
Origin commit data
------------------
Commit: b072232956
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)
 2012-04-10 14:35:09 +04:00
gixxpunk
718a7860c4 yweb: add new keys (patch by FlatTV) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2202 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 0db5dc72a9
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-04-09 (Mon, 09 Apr 2012)

Origin message was:
------------------
- yweb: add new keys (patch by FlatTV)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2202 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-04-09 09:55:42 +00:00
Michael Liebmann
8b44cd153f Creating a screenshot added to yWeb 
- Create Screenshot: http://box/control/screenshot
 (patch by FlatTv)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2194 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 45a2a6eab8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-08 (Sun, 08 Apr 2012)

Origin message was:
------------------
* Creating a screenshot added to yWeb

- Create Screenshot: http://box/control/screenshot
 (patch by FlatTv)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2194 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-04-08 12:26:08 +00:00
Jacek Jendrzej
f4d9823d70 nhttpd:-fix standby info 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2172 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: d702881157
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-02 (Mon, 02 Apr 2012)
 2012-04-02 20:38:34 +00:00