# HG changeset patch # User Yoshiki Yazawa # Date 1270668140 -32400 # Node ID 3d4df1fe41667a95575c3885683e6ae1580c8714 # Parent 47a3acf19870b79e13f9c8a770174f48a50e4592# Parent 254d8a21bf3627ef39d369b89392985c7190ed9c merged with upstream diff -r 254d8a21bf36 -r 3d4df1fe4166 DBRecord.class.php diff -r 254d8a21bf36 -r 3d4df1fe4166 Keyword.class.php diff -r 254d8a21bf36 -r 3d4df1fe4166 Reservation.class.php diff -r 254d8a21bf36 -r 3d4df1fe4166 Settings.class.php diff -r 254d8a21bf36 -r 3d4df1fe4166 config.php.sample diff -r 254d8a21bf36 -r 3d4df1fe4166 do-record.sh.pt1 diff -r 254d8a21bf36 -r 3d4df1fe4166 fix_permission.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fix_permission.sh Thu Apr 08 04:22:20 2010 +0900 @@ -0,0 +1,3 @@ +#!/bin/sh +chmod 777 cache settings templates templates_c thumbs +chmod -f 666 settings/config.xml diff -r 254d8a21bf36 -r 3d4df1fe4166 getepg.php diff -r 254d8a21bf36 -r 3d4df1fe4166 index.php --- a/index.php Tue Apr 06 11:03:45 2010 +0900 +++ b/index.php Thu Apr 08 04:22:20 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 254d8a21bf36 -r 3d4df1fe4166 programTable.php diff -r 254d8a21bf36 -r 3d4df1fe4166 reclib.php diff -r 254d8a21bf36 -r 3d4df1fe4166 recomplete.php diff -r 254d8a21bf36 -r 3d4df1fe4166 simpleReservation.php diff -r 254d8a21bf36 -r 3d4df1fe4166 storeProgram.php diff -r 254d8a21bf36 -r 3d4df1fe4166 templates/envSetting.html --- a/templates/envSetting.html Tue Apr 06 11:03:45 2010 +0900 +++ b/templates/envSetting.html Thu Apr 08 04:22:20 2010 +0900 @@ -176,7 +176,7 @@

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

1ページに表示する番組表の長さを時間で設定します。標準は8時間分です。
- +
diff -r 254d8a21bf36 -r 3d4df1fe4166 video/index.html --- a/video/index.html Tue Apr 06 11:03:45 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -