mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-10 15:18:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,117 Commits 1 Branch 51 Tags
d1eebea38173f2649a84b8c23ddeb44a2370b41b
Commit Graph

362 Commits

Author SHA1 Message Date
[CST] Bas
fb81654ef2 neutrino: make default language english. 2013-01-29 01:10:07 +08:00
[CST] Bas
8e8b65e9d2 neutrino: add predefined config for nhttpd. 2013-01-29 01:06:26 +08:00
[CST] Bas
8dfa226920 neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths. 2013-01-25 10:33:40 +08:00
[CST] Focus
0ea1a39e0a Merge branch 'dvbsi++' into next 2013-01-16 16:36:07 +04:00
Stefan Seyfried
28e1a4a988 Merge branch 'uncool/dvbsi++' commit d0ea4ad62e 2013-01-13 22:49:12 +01:00
Stefan Seyfried
a5ed005ff8 neutrino: enable screenshots 2013-01-13 18:49:37 +01:00
micha-bbg
6b9045def9 * yWeb: Because of format changes klack.de temporarily disabled 2013-01-11 19:04:48 +01:00
micha-bbg
28c0525e14 * yWeb: Update timer sync for tvinfo.de 2013-01-11 11:21:28 +01:00
[CST] Focus
d3d2efe475 Makefiles.am: add conditional include for libcoolstream 2013-01-11 14:17:16 +04:00
[CST] Focus
6e41c65fad merge public git changes 2013-01-09 19:30:07 +04:00
Stefan Seyfried
8d69036be5 Merge branch 'uncool/dvbsi++' commit 3bbaddec39 
Conflicts:
	src/driver/framebuffer.cpp
 2013-01-03 09:46:11 +01:00
Gaucho316
1b4ad51d0a nhttpd: don't decode URL parameters multiple times 2012-12-31 07:04:52 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
satbaby
4965619a79 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp: add current transponder pchannels list , use: <BOXID>/control/currenttpchannels 2012-12-23 19:12:41 +01:00
satbaby
b58cbd4135 src/nhttpd/yhttpd_core/yrequest.cpp: maybe needed, supplement to 289e927e04 2012-12-22 17:19:43 +01:00
satbaby
8b35ae8060 src/nhttpd/web/scripts/Y_Tools.sh: show alle prozesse 2012-12-22 17:12:22 +01:00
satbaby
289e927e04 src/nhttpd/yhttpd_core/yrequest.cpp: fix automount string decode 2012-12-22 16:42:00 +01:00
satbaby
2d1beb8402 nhttpd: fix encode bouquet and audio name 2012-12-20 21:05:44 +01:00
satbaby
f66b2baedc nhttpd: dont doubles decode, revert ed318d97bc 2012-12-17 22:01:46 +01:00
satbaby
ed318d97bc nhttpd: skip doubles decode on channlename, revert 42b69a8a5e 2012-12-17 12:58:24 +01:00
satbaby
42b69a8a5e src/nhttpd/yhttpd_core/helper.cpp: dont decode '+' to ' ', fix for channelname with '+' 2012-12-14 14:34:18 +01:00
satbaby
b3ddc46e14 supplement to dc33e93375 2012-12-08 17:53:01 +01:00
satbaby
dc33e93375 yWeb: Timer: dont stop recording after modifying timer - Timer: sets audio-pid correctly - Timer: seconds set to Null 2012-12-08 17:47:25 +01:00
satbaby
fe16513b4f src/nhttpd: fix segfault if logging on 2012-12-07 11:13:51 +01:00
[CST] Bas
9448cd8d2a Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/nhttpd/yhttpd.cpp
 2012-12-07 14:39:05 +08:00
satbaby
2fbe881180 src/nhttpd/yhttpd_mods/mod_yparser.cpp: workaround fix for segfault if server.log.loglevel=5 and read timer 2012-12-06 23:11:56 +01:00
satbaby
5e4a541781 src/nhttpd: clean code 2012-11-28 19:03:03 +01:00
Stefan Seyfried
e5e7d52fa1 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
 2012-11-23 18:45:22 +01:00
satbaby
d113487d35 src/nhttpd/web/Y_VLC.js fix for vlc windows 2.0.2 version parse 2012-11-21 13:36:56 +01:00
satbaby
e111712fc6 src/nhttpd/web/Y_VLC.js: fix vlc version parse 2012-11-20 19:28:28 +01:00
svenhoefer
8131a25af1 - yweb: fix remotecontrol; remove dependency from MAC 2012-11-19 22:33:50 +01:00
[CST] Bas
89bf2f6846 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/neutrino.cpp
 2012-11-13 12:51:18 +08:00
[CST] Bas
e426104399 neutrino: fix config file locations. 2012-11-13 12:45:17 +08:00
Stefan Seyfried
c480e36746 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h
 2012-11-11 01:45:22 +01:00
satbaby
926e0ce141 initialize not initialized var 2012-11-05 09:24:51 +01:00
Stefan Seyfried
e0acbd3ddb 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
 2012-11-03 14:05:48 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...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
 2012-11-03 10:45:33 +01:00
satbaby
ec48d24af2 nhttpd/web/Y_Tools_Rcsim.yhtm: skip shutdown ask if box is in standby 2012-10-24 11:14:09 +02:00
satbaby
cf1dfdad7c controlapi.cpp:revert to standard output 2012-10-22 21:28:38 +02:00
satbaby
9a2d6aea26 rc_lock: lock for rc_lock, use only once, supplement to 9e3567dc09 2012-10-22 15:52:07 +02:00
satbaby
9e3567dc09 nhttpd::controlapi.cpp:execute more comands on/off only once (fix doubleclick) 2012-10-22 14:00:01 +02:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...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
 2012-10-14 12:51:07 +02:00
striper
636f7cef05 - Fix daylight saving time bug in timers (backport from tuxbox-cvs) 2012-10-13 21:36:38 +02:00
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
svenhoefer
c93b3cb489 - yweb: fix border-radius for old browsers 2012-08-18 15:26:07 +02:00
svenhoefer
8fd5a12ef5 - yweb: increase version (for two commits) 2012-08-12 22:15:37 +02:00
svenhoefer
ca0733d8ea - yweb: rework align in Y_Boxcontrol_Bouquets.yhtm 2012-08-12 22:02:09 +02:00
svenhoefer
8ba7cf1a95 - yweb: fix margin of boxes 2012-08-12 21:56:07 +02:00
satbaby
a967cf4f4b optimize jpg,png size 2012-08-08 17:10:12 +02:00