Commit Graph

1317 Commits

Author SHA1 Message Date
Leufolium 50df41672d Merge branch 'feat-IRONFANS-210-Robin' into release-20241017 2024-10-17 20:24:15 +08:00
Leufolium 605eda4830 1 2024-10-17 20:05:06 +08:00
Leufolium ee3a73d695 by Robin at 20241017 2024-10-17 11:22:49 +08:00
Leufolium 8c4579d749 by Robin at 20241015 2024-10-15 16:54:43 +08:00
Leufolium 57f1775a2c by Robin at 20241015 2024-10-15 16:02:08 +08:00
lwl0608 03d2923a7f freeze 2024-10-11 16:33:25 +08:00
lwl0608 aed10596a3 freeze_apollo 2024-10-11 16:26:41 +08:00
chenhao 8662ce92e4 Merge pull request 'by Robin at 20241011' (#752) from feat-IRONFANS-229-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/752
2024-10-11 16:10:46 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +08:00
chenhao 05d1da9b1b Merge pull request 'by Robin at 20241011' (#747) from feat-IRONFANS-228-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/747
2024-10-11 13:52:32 +08:00
Leufolium c34a0f25f8 by Robin at 20241011 2024-10-11 13:43:45 +08:00
lwl0608 9f0c598e40 add freeze mid 513920 2024-10-10 08:26:05 +08:00
lwl0608 9836c10abe add freeze mid 2024-10-09 21:07:32 +08:00
chenhao da8ef80293 Merge pull request 'BUG-20241004-Robin' (#745) from BUG-20241004-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/745
2024-10-04 17:21:02 +08:00
Leufolium 4fc15bcf79 by Robin at 20241004 2024-10-04 17:17:21 +08:00
Leufolium e6794cf887 by Robin at 20241004; fix 2024-10-04 17:10:14 +08:00
lwl0608 9be64dca0c Merge branch 'dev-lwl/withdraw' 2024-09-28 21:31:16 +08:00
lwl0608 9ed151c9d8 withdraw 2024-09-28 21:30:49 +08:00
chenhao bfa364fdc2 Merge pull request 'by Robin at 20240927' (#741) from feat-IRONFANS-220-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/741
2024-09-27 15:09:35 +08:00
Leufolium 6e3d0267be by Robin at 20240927 2024-09-27 15:08:48 +08:00
lwl0608 c25e1ea623 Merge branch 'dev_tx_cdn' 2024-09-27 11:03:02 +08:00
lwl0608 cff16c7d1e tx cdn full 2024-09-27 11:02:06 +08:00
lwl0608 7ccf19b848 freeze add mid 2024-09-25 20:02:09 +08:00
chenhao 772d00e225 Merge pull request 'feat-IRONFANS-218-Robin' (#740) from feat-IRONFANS-218-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/740
2024-09-25 13:39:21 +08:00
Leufolium d1b38d53c2 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-218-Robin 2024-09-25 13:18:50 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +08:00
lwl0608 3a982826ed tx cdn 2024-09-25 00:45:26 +08:00
lwl0608 b555fb50fb fix cdn tx 2024-09-24 14:07:36 +08:00
lwl0608 524296fbf1 Merge branch 'dev_lwl' 2024-09-18 22:29:27 +08:00
lwl0608 c80d1575f1 fix SrcVidMap 2024-09-18 22:29:12 +08:00
lwl0608 dc5da5a647 add update pf 2024-09-14 16:25:14 +08:00
lwl0608 ae710ffbc9 fix alipay rate 2024-09-12 15:46:22 +08:00
chenhao 83f4ca3dfd Merge pull request '1' (#733) from feat-IRONFANS-213-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/733
2024-09-12 15:23:46 +08:00
Leufolium 06444e01c9 1 2024-09-12 15:23:24 +08:00
chenhao 5c795206d0 Merge pull request 'by Robin at 20240912; add streamer cancel proc' (#732) from feat-IRONFANS-213-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/732
2024-09-12 15:19:39 +08:00
Leufolium 73f634279e by Robin at 20240912; add streamer cancel proc 2024-09-12 15:18:13 +08:00
chenhao 42cb2fb2ea Merge pull request 'by Robin at 20240911;' (#730) from feat-IRONFANS-205-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/730
2024-09-12 11:59:04 +08:00
Leufolium 46130b15fc by Robin at 20240911; 2024-09-11 11:27:39 +08:00
Leufolium 63cf9f1b21 by Robin at 20240911; separate 2024-09-11 11:26:43 +08:00
Leufolium f18a483d39 by Robin at 20240911; separate 2024-09-11 11:23:40 +08:00
chenhao 062f6473ac Merge pull request 'by Robin at 20240911; vdmdbug' (#726) from BUG-20240911-vd into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/726
2024-09-11 11:01:09 +08:00
Leufolium 13716f6bad by Robin at 20240911; vdmdbug 2024-09-11 11:00:47 +08:00
lwl0608 53d01fb04d fix xreponse 2024-09-10 18:50:09 +08:00
lwl0608 2421f038e6 fix fill media 2024-09-10 18:43:55 +08:00
lwl0608 eea29e86ec Merge branch 'dev_search_zmember' 2024-09-10 18:13:25 +08:00
lwl0608 d30cac1c02 fix media 2024-09-10 18:12:57 +08:00
lwl0608 152918b754 Merge branch 'dev_search_zmember' 2024-09-10 17:50:09 +08:00
lwl0608 67debe2845 fix 2024-09-10 17:49:51 +08:00
chenhao 95e5da50d5 Merge pull request 'by Robin at 20240819' (#725) from feat-IRONFANS-201-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/725
2024-09-10 15:20:58 +08:00
Leufolium fe902eac77 by Robin at 20240910, remove token auth 2024-09-10 14:24:03 +08:00