jolly/jr-web #3615 【2/5 15:00】海賊団更新マージ

Description

opened by wada at 2024-07-24T16:25:00; updated 2025-02-05T15:02:19

概要

海賊団に関連するPRのマージ

マージPR

7308【10/26本番アップ】海賊団移籍を分離
7897【今日】存在しない海賊団にアクセスするとワーニングが出る
8035【5/24】貢献度のINT値がカンスト時の表示修正
8112【6/17】重要コメントを見に行った時の自動スクロール対応
8148【6/30】海賊団ページの紹介文下の続きを見るボタンが表示されないことがある
8151【7/13】海賊団メンバーリストの改善
8177【7/28】海賊団チーム紹介の続きを読むボタン表示の修正
8183【画像】海賊団メンバーリストの改善の画像
8248【すぐ】団員リスト内のボタンが押せない仕様になってた。

Comment

#35770 by wada at 2024-07-24T16:25:10; updated 2024-07-24T16:25:10

@kouho
レビューお願いします。

wada change_title at 2024-08-05T11:51:04: 【8/1】海賊団更新マージ海賊団更新マージ

Comment

#38495 by kouho at 2025-01-17T18:40:13; updated 2025-01-17T18:40:51

@wada
マージ自体は問題ないと思いますが、
7897【今日】存在しない海賊団にアクセスするとワーニングが出る

存在しない海賊団にアクセスしたら自分の海賊団ページにリダイレクトするなどの方が適切だと思いました。

kouho add_label at 2025-01-17T18:40:16: コメントあり

Comment

#38586 by wada at 2025-01-27T09:00:10; updated 2025-01-27T09:00:10

@kouho
> 存在しない海賊団にアクセスしたら自分の海賊団ページにリダイレクトするなどの方が適切だと思いました。

そうですね。
本マージPRでは対応しませんが、今後そういった対応ができればと思います。

kouho add_label at 2025-01-27T09:25:30: 皇甫 LGTM

Comment

#38588 by kouho at 2025-01-27T09:25:46; updated 2025-01-27T09:25:46

@wada
かしこまりました。確認OKです。

Comment

#38720 by wada at 2025-02-04T11:29:41; updated 2025-02-04T11:29:41

2/5(水) 15:00 リリース

wada change_title at 2025-02-04T15:22:08: 海賊団更新マージ【2/5 15:00】海賊団更新マージ

wada merge at 2025-02-05T15:02:12: 【2/5 15:00】海賊団更新マージ

wada close at 2025-02-05T15:02:12: Close

wada delete_branch at 2025-02-05T15:02:19: team_page

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2024-07-24T16:25:00
updated	2025-02-05T15:02:19

Labels

レビュー待ちマスタへマージ皇甫 LGTMコメントあり

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:team_page
from	ef1cb9dd2e841bcdb48820ce527d7b05cdf0a17a
to	604a1016f2410181fdab7903772a0fa874cdb619

Commit range

base	`ef1cb9dd2e841bcdb48820ce527d7b05cdf0a17a`
head	`604a1016f2410181fdab7903772a0fa874cdb619`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:team_page

View commits

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

Files changed115 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/ajax/ranking_default.inc`
modified	`lib/ajax/team_detail.inc`
modified	`lib/ajax/team_request.inc`
modified	`lib/conf/define.inc`
added	`lib/public/Team-Request.inc`
modified	`public_html/ajax.php`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm01.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm02.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm03.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm04.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm05.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm06.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm07.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm08.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm09.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm10.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm11.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm12.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm13.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm14.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm15.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm16.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm17.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm18.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm19.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm20.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm21.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm22.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm23.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm24.png`
added	`public_html/img/team/member_list/animation/rank1/rank1_anm25.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm01.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm02.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm03.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm04.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm05.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm06.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm07.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm08.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm09.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm10.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm11.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm12.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm13.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm14.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm15.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm16.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm17.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm18.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm19.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm20.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm21.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm22.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm23.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm24.png`
added	`public_html/img/team/member_list/animation/rank2/rank2_anm25.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm01.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm02.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm03.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm04.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm05.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm06.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm07.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm08.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm09.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm10.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm11.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm12.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm13.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm14.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm15.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm16.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm17.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm18.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm19.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm20.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm21.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm22.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm23.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm24.png`
added	`public_html/img/team/member_list/animation/rank3/rank3_anm25.png`
added	`public_html/img/team/member_list/btn_island.png`
added	`public_html/img/team/member_list/icon_conquer.png`
added	`public_html/img/team/member_list/icon_contribution.png`
added	`public_html/img/team/member_list/icon_deck_battle.png`
added	`public_html/img/team/member_list/icon_deck_war.png`
added	`public_html/img/team/member_list/icon_location.png`
added	`public_html/img/team/member_list/icon_login.png`
added	`public_html/img/team/member_list/icon_trade.png`
added	`public_html/img/team/member_list/icon_treasure.png`
added	`public_html/img/team/member_list/rankback.png`
added	`public_html/img/team/member_list/rankbar_1.png`
added	`public_html/img/team/member_list/rankbar_2.png`
added	`public_html/img/team/member_list/rankbar_3.png`
added	`public_html/img/team/member_list/rankbar_4_10.png`
added	`public_html/img/team/member_list/tab_rank_battle.png`
added	`public_html/img/team/member_list/tab_rank_battle_off.png`
added	`public_html/img/team/member_list/tab_rank_contribution.png`
added	`public_html/img/team/member_list/tab_rank_contribution_off.png`
added	`public_html/img/team/member_list/tab_rank_island.png`
added	`public_html/img/team/member_list/tab_rank_island_off.png`
added	`public_html/img/team/member_list/tab_rank_treasure.png`
added	`public_html/img/team/member_list/tab_rank_treasure_off.png`
added	`public_html/img/team/member_list/tab_rank_war.png`
added	`public_html/img/team/member_list/tab_rank_war_off.png`
modified	`public_html/index.php`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/template/Team-EmblemSelect.tpl`
added	`public_html/template/Team-Request.tpl`
modified	`public_html/template/Team.tpl`
modified	`public_html/template/TeamWar-Enemy.tpl`
modified	`public_html/template/TeamWar-Own.tpl`
modified	`public_html/template/header_sp.tpl`

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