mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
a5c3e44daff1bbf9ee1b65d41b62c642f51a7bdf
recycled-ni-neutrino/data/y-web
History
vanhofen 483c39bef1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



------------------
This commit was generated by Migit
2017-11-02 23:25:41 +01:00
..
extentions
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
images
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-11-02 23:25:41 +01:00
info
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
jquery
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
languages
yWeb: enable auto-reload of screenshots
2017-10-29 18:33:14 +01:00
scripts
yWeb: enable grab to do screenshots
2017-10-29 18:32:35 +01:00
styles
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
accordion.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
channels.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
channels.txt
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
effects.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
extentions.txt
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
favicon.ico
y-web: remove white background from favicon
2017-09-14 12:14:41 +02:00
index.html
y-web: show hostname as page-title
2017-09-14 12:14:41 +02:00
Makefile.am
NI-yWeb: fix missing %(WEBTVDIR) replacement
2017-01-26 21:36:14 +01:00
prototype.js
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
robots.txt
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_About.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Baselib.js
yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
2017-03-01 11:51:25 +01:00
Y_blank.htm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Blocks.txt
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-11-02 23:25:41 +01:00
Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Boxcontrol_Bouquet_Editor_Main.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Boxcontrol_Bouquetlist.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Boxcontrol_Bouquets.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Boxcontrol_Channellist.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Boxcontrol_Menue.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Boxcontrol_Messages.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Dist.css
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Dyn_Pages.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_EPG_Plus.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-03-01 13:09:50 +01:00
Y_EPG.js
yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
2017-03-01 11:51:25 +01:00
Y_Ext_Menue.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Ext_Settings.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Ext_Uninstall.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Ext_Update_refresh.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Ext_Update.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Ext_Update.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Filemgr_blocks.txt
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Filemgr_Edit.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Filemgr.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Flash.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Info_Help.yhtm
fix link to developer forum
2016-12-23 14:12:46 +01:00
Y_Info_Menue.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Info_Updates.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live_DoubleView.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live_EPG_Info.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live_EPG.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-03-01 13:09:50 +01:00
Y_Live_Menue.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Live_Msg.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live_Record.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live_Transcode.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Live.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_LiveViewFull.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Main.css
yWeb: fix e63c34b00c
2017-10-29 18:33:41 +01:00
Y_Menue.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_neutrino_Blocks.txt
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_NI_About.yhtm
NI-yWeb: small whitespace cleanup
2016-12-23 23:45:06 +01:00
Y_NI_blank.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_Blocks.txt
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_Camd-control.yhtm
small adds
2017-09-09 15:33:46 +02:00
Y_NI_Dyn_Pages.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_Infoicons-control.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_m3uConInfo.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_m3uConvert.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_Menue.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_NetFS-control.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_NetFS-edit.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_NetFS-init.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_Plugin-control.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI_PZapit-control.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NI.css
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_NIlib.js
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Refresh.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_automount_liste.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_automount.yhtm
yWeb: align cifs-mounts to new automount-syntax
2017-09-14 12:14:41 +02:00
Y_Settings_Backup.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Settings_buttons.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_lcd.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_Live.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_Menue.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_mount_liste.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_mount.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_neutrino_forms.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_nhttpd.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_personalize.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_Timer.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_umount_liste.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_video_audio.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_VNC.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_wol.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Settings_yWeb.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-11-02 23:25:41 +01:00
Y_Settings_zapit.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_StreamInfo.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Timer_Edit.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Timer_List.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Bootlogo.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Boxcontrol.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-11-02 23:25:41 +01:00
Y_Tools_Check_Install.yhtm
yWeb: enable grab to do screenshots
2017-10-29 18:32:35 +01:00
Y_Tools_Cmd.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Flash_Menue.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Flash_Upload.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Tools_Info_Menue.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Installer.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_lcshot.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Menue.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
Y_Tools_Rcsim.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Screenshot.yhtm
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-11-02 23:25:41 +01:00
Y_Tools_Timer_Sync.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_Timer_Sync.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Tools_tvshot.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_User.css
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Version.txt
yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
2017-03-01 11:51:25 +01:00
Y_VLC.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_Wait.yhtm
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
Y_yweb.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00
ywidget.css
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-12-15 14:12:33 +01:00
ywidget.js
yWeb: move data from /src to /data
2016-12-15 14:00:45 +01:00