mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,093 Commits 1 Branch 51 Tags
889c9966244c77a8a1a47d450d3512c4ee5585a0
Commit Graph

731 Commits

Author SHA1 Message Date
[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
svenhoefer
03132b1f95 - mod_yparser: add a command to create comments 2012-07-26 21:45:15 +02:00
svenhoefer
84e94ad4ca - yweb: get version-info from http://git.coolstreamtech.de 2012-07-25 18:09:49 +02:00
svenhoefer
596b64b410 - yweb: remove ftpfs-option from mount-settings 2012-07-25 15:06:49 +02:00
svenhoefer
a53320fb4d - yweb: rework buttons 2012-07-25 14:52:57 +02:00
svenhoefer
7d3f40d290 - yweb: remove obsolete and non-working code from boxcontrol 2012-07-25 14:32:08 +02:00
svenhoefer
874dd3f3da - yweb: increase version (i urgently need an automatism for that.) 2012-07-25 11:51:39 +02:00
svenhoefer
a4d82f0ddb - yweb: fix 'df'-output to determinate space on mtd 2012-07-25 11:25:05 +02:00
svenhoefer
b28c069837 -yweb: fix 957d9c6555 2012-07-25 08:46:53 +02:00
svenhoefer
957d9c6555 - yweb: some more corrections in languagefiles and design 
* replace background-images with plain css
 2012-07-25 01:06:47 +02:00
svenhoefer
8456bcd80d - yweb: remork submenus for a better readability 
* add a new block for management-links to be more generic
  * some marginal design-fixes
 2012-07-24 21:23:46 +02:00
svenhoefer
80e59f5bfe - yweb: increase reload-timeout for osd-screenshots 2012-07-24 00:01:32 +02:00
svenhoefer
d46ee1a74e - yweb: remove my obsolete english entrys in portuguese languagefile 2012-07-23 23:03:53 +02:00
svenhoefer
a1f3b4b6b6 - yweb: show Y_About.yhtm at a click on the info link 2012-07-23 22:49:02 +02:00
svenhoefer
3b628834d4 - yweb: improve record-settings 2012-07-23 22:44:49 +02:00
svenhoefer
2189d30d56 - yweb: fix usage of Y_Version.txt; increase version (for three commits) 2012-07-23 12:58:01 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
svenhoefer
17fd189410 - yweb: rework, localize and enable backup/restore 2012-07-21 23:31:59 +02:00
svenhoefer
48dea3faf0 - yweb: remove obsolete ucodes-code 2012-07-21 12:53:18 +02:00
svenhoefer
05c4897504 - yweb: increase version (for two commits) 2012-07-20 23:46:39 +02:00
svenhoefer
a62210d974 - yweb: rework and enable movieplayer-settings 2012-07-20 23:45:13 +02:00
svenhoefer
39a44545e0 - yweb: missing u 2012-07-20 22:41:40 +02:00
svenhoefer
f6ae36664e - yweb: rework and enable zapit-settings 2012-07-20 22:35:32 +02:00
svenhoefer
c4e5336619 - yweb: increase version 2012-07-20 17:06:27 +02:00
svenhoefer
eee9f078b0 - yweb: fix directory for records in timersettings; move block to Y_neutrino_Blocks.txt 2012-07-20 17:02:13 +02:00
svenhoefer
2d0cc14810 - yweb: fix start directory for pictureviewer 2012-07-20 11:14:37 +02:00
svenhoefer
250708158a - yweb: fix start directory for audioplayer 2012-07-20 10:32:55 +02:00
Thilo Graf
eda3740d8b yWeb: change version 2.8.0.8 to 2.8.0.9 2012-07-08 22:01:12 +02:00
Thilo Graf
179a9fc5ba yWeb: fix support links 2012-07-08 22:01:12 +02:00
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +02:00
satbaby
c1a1aae4c1 use empty() instead of size() 2012-06-16 10:38:38 +02:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00