jolly/jr-web #303 お知らせIDの例外処理削除

Description

opened by wada at 2020-10-01T12:08:38; updated 2023-02-15T17:16:19

issue #302

Comment

#7455 by wada at 2020-10-01T12:12:55; updated 2020-10-01T12:12:55

@iwamoto
レビューお願いします。
これだけlib/ajax/default_info.inc

Comment

#7456 by iwamoto at 2020-10-01T12:16:12; updated 2020-10-01T12:16:12

@wada
こちら問題ないと思います

wada delete_label at 2020-10-01T13:30:44: レビュー待ち

wada close at 2020-10-01T16:05:08: Close

Comment

#7469 by wada at 2020-10-01T16:06:15; updated 2020-10-01T16:06:15

ローカルでマージ

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2020-10-01T12:08:38
updated	2023-02-15T17:16:19

Labels

デベロップへマージ

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:fix_info_302
from	473e3bae51f6c94d6b88205a53a0c39c50799557
to	7fa3c477b123a364997f660ee65d00fa319182c6

Commit range

base	`473e3bae51f6c94d6b88205a53a0c39c50799557`
head	`7fa3c477b123a364997f660ee65d00fa319182c6`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:fix_info_302

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.

Files changed63 filesView patch

status	file
modified	`lib/ajax/default_info.inc`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/del_user_material_request.sh`
added	`lib/exec/tool_send_presents.php`
modified	`lib/models/dao/log_yamada_athletic.php`
modified	`lib/models/dao/log_yamada_point.php`
added	`public_html/img/banner/RaidEvent/raid_banner_6_1.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_6_2.jpg`
modified	`public_html/img/gacha/118/banner_gacha118.jpg`
modified	`public_html/img/gacha/118/banner_gacha118_2.jpg`
modified	`public_html/img/gacha/118/gacha118.jpg`
modified	`public_html/img/gacha/118/gacha118_2.jpg`
modified	`public_html/img/gacha/118/gacha118_card_info174.jpg`
modified	`public_html/img/gacha/118/gacha118_card_info180.jpg`
modified	`public_html/img/gacha/118/gacha118_card_info190.jpg`
modified	`public_html/img/gacha/118/gacha118_card_info205.jpg`
modified	`public_html/img/gacha/118/gacha118_info.jpg`
modified	`public_html/img/gacha/118/gacha118_info2.jpg`
modified	`public_html/img/gacha/118/gacha118_info3.jpg`
modified	`public_html/img/gacha/118/gacha118_info4.jpg`
renamed	`public_html/img/gacha/118/gacha118_info1.jpg -> public_html/img/gacha/118/gacha118_title2.jpg`
added	`public_html/img/info_event/info_event_52_1.jpg`
added	`public_html/img/info_event/info_event_52_2.jpg`
added	`public_html/img/info_event/info_event_53_1.jpg`
added	`public_html/img/info_event/info_event_53_2.jpg`
added	`public_html/img/info_jrye/236/info1.jpg`
added	`public_html/img/info_jrye/236/info2.jpg`
added	`public_html/img/info_jrye/236/info3.jpg`
added	`public_html/img/info_jrye/236/info4.jpg`
added	`public_html/img/info_jrye/236/info5.jpg`
added	`public_html/img/info_jrye/236/info6.jpg`
added	`public_html/img/info_jrye/236/info7.jpg`
added	`public_html/img/info_jrye/241/info1.jpg`
added	`public_html/img/info_jrye/241/info2-2.jpg`
added	`public_html/img/info_jrye/241/info2-3.jpg`
added	`public_html/img/info_jrye/241/info3.jpg`
added	`public_html/img/info_jrye/241/info4.jpg`
added	`public_html/img/info_jrye/241/info6-2.jpg`
added	`public_html/img/info_jrye/241/info6-3.jpg`
added	`public_html/img/info_jrye/241/info6.jpg`
added	`public_html/img/info_jrye/242/event_logo.png`
added	`public_html/img/info_jrye/242/info1.jpg`
added	`public_html/img/info_jrye/242/info2.jpg`
added	`public_html/img/info_jrye/242/info6.jpg`
added	`public_html/img/info_jrye/242/info_gk.jpg`
added	`public_html/img/info_jrye/242/itemrank1.png`
added	`public_html/img/info_jrye/242/itemrank2.png`
added	`public_html/img/info_jrye/242/reward_info.jpg`
added	`public_html/img/info_jrye/242/vs-reward1.jpg`
added	`public_html/img/info_jrye/242/vs-reward2.jpg`
added	`public_html/img/info_jrye/242/vs-reward3.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_collector_1.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_shop_3.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_shop_4.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_team_raid.jpg`
deleted	`public_html/img/info_jrye/RaidEventImg/info_team_raid_1.jpg`
deleted	`public_html/img/info_jrye/RaidEventImg/info_team_raid_2.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_205.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_205.jpg`
added	`public_html/img/raid/point_item/29_1.png`
added	`public_html/img/raid/point_item/29_2.png`
added	`public_html/img/ranking/event_raid/info_raid6.jpg`
modified	`public_html/template/header_sp.tpl`

Patch body is stored as a separate file to keep this page lightweight.