# HG changeset patch # User Yoshiki Yazawa # Date 1271412538 -32400 # Node ID 4dee3368df638b0806bf01dc3e81b98fe9d926b8 # Parent 3d4df1fe41667a95575c3885683e6ae1580c8714# Parent b307e3749e8094b83cb31a91a273a34df1577fe6 merged with upstream diff -r b307e3749e80 -r 4dee3368df63 DBRecord.class.php diff -r b307e3749e80 -r 4dee3368df63 Keyword.class.php diff -r b307e3749e80 -r 4dee3368df63 Reservation.class.php diff -r b307e3749e80 -r 4dee3368df63 Settings.class.php diff -r b307e3749e80 -r 4dee3368df63 config.php.sample diff -r b307e3749e80 -r 4dee3368df63 do-record.sh.pt1 diff -r b307e3749e80 -r 4dee3368df63 fix_permission.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fix_permission.sh Fri Apr 16 19:08:58 2010 +0900 @@ -0,0 +1,3 @@ +#!/bin/sh +chmod 777 cache settings templates templates_c thumbs +chmod -f 666 settings/config.xml diff -r b307e3749e80 -r 4dee3368df63 getepg.php diff -r b307e3749e80 -r 4dee3368df63 index.php --- a/index.php Fri Apr 16 18:04:23 2010 +0900 +++ b/index.php Fri Apr 16 19:08:58 2010 +0900 @@ -226,7 +226,7 @@ // date("Y-m-d H:i:s", $timestamp); $sitetitle = date( "Y", $top_time ) . "年" . date( "m", $top_time ) . "月" . date( "d", $top_time ) . "日". date( "H", $top_time ) . - "時～".( $type == "GR" ? "地上デジタル" : "BSデジタル" )."番組表"; + "時〜".( $type == "GR" ? "地上デジタル" : "BSデジタル" )."番組表"; $smarty->assign("sitetitle", $sitetitle ); diff -r b307e3749e80 -r 4dee3368df63 programTable.php diff -r b307e3749e80 -r 4dee3368df63 reclib.php diff -r b307e3749e80 -r 4dee3368df63 recomplete.php diff -r b307e3749e80 -r 4dee3368df63 simpleReservation.php diff -r b307e3749e80 -r 4dee3368df63 storeProgram.php diff -r b307e3749e80 -r 4dee3368df63 templates/envSetting.html --- a/templates/envSetting.html Fri Apr 16 18:04:23 2010 +0900 +++ b/templates/envSetting.html Fri Apr 16 19:08:58 2010 +0900 @@ -176,7 +176,7 @@

ページに表示する番組表の長さ（時間）

1ページに表示する番組表の長さを時間で設定します。標準は8時間分です。
- +
diff -r b307e3749e80 -r 4dee3368df63 video/index.html --- a/video/index.html Fri Apr 16 18:04:23 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -