Commit Graph

2057 Commits

Author SHA1 Message Date
Leufolium c5676a3356 Merge remote-tracking branch 'origin/feat-IRONFANS-220-Robin' into test 2024-09-27 15:10:42 +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 dde86a5447 g 2024-09-27 11:02:52 +08:00
lwl0608 cff16c7d1e tx cdn full 2024-09-27 11:02:06 +08:00
lwl0608 c02f8f13c2 Merge branch 'dev_freeze' into test 2024-09-25 20:02:21 +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
chenhao 43bd817861 Merge pull request 'confsms' (#739) from confsms into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/739
2024-09-25 13:26:03 +08:00
Leufolium 8af9117ba1 1 2024-09-25 13:25:09 +08:00
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +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 bfe734ab78 tx cdn 50 2024-09-25 00:45:50 +08:00
lwl0608 3a982826ed tx cdn 2024-09-25 00:45:26 +08:00
lwl0608 0a26b2d2a1 mod 2024-09-24 14:07:56 +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 d5fc511403 Merge branch 'dev_lwl' into test 2024-09-18 22:29:20 +08:00
lwl0608 c80d1575f1 fix SrcVidMap 2024-09-18 22:29:12 +08:00
lwl0608 80eabf0a5e Merge branch 'dev_PF' into test 2024-09-14 16:25:32 +08:00
lwl0608 dc5da5a647 add update pf 2024-09-14 16:25:14 +08:00
chenhao 5d25fb345a Merge pull request 'feat-IRONFANS-212-Robin' (#737) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/737
2024-09-12 16:32:21 +08:00
Leufolium 857679c1fc 1 2024-09-12 16:32:04 +08:00
Leufolium 84e28cb08b by Robin at 20240912; read all 2024-09-12 16:29:24 +08:00
chenhao f202adbb5f Merge pull request 'by Robin at 20240912;' (#736) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/736
2024-09-12 16:19:11 +08:00
Leufolium 4038b87864 by Robin at 20240912; 2024-09-12 16:18:48 +08:00
chenhao 7b807a421c Merge pull request 'by Robin at 20240912' (#735) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/735
2024-09-12 16:07:11 +08:00
Leufolium 321988d149 by Robin at 20240912 2024-09-12 16:06:31 +08:00
chenhao 6b91c35199 Merge pull request 'feat-IRONFANS-212-Robin' (#734) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/734
2024-09-12 15:51:32 +08:00
Leufolium 047178782e by Robin at 20240912 2024-09-12 15:50:34 +08:00
lwl0608 c935cc2400 Merge branch 'dev_lwl' into test 2024-09-12 15:46:32 +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
chenhao 048669f8fb Merge pull request 'feat-IRONFANS-213-Robin' (#731) from feat-IRONFANS-213-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/731
2024-09-12 15:19:28 +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 cdb1f9a24a by Robin at 20240912 2024-09-12 11:54:16 +08:00
Leufolium b5f0159358 by Robin at 20240911; notificaton 2024-09-11 15:44:49 +08:00
chenhao 56fe389cd4 Merge pull request 'feat-IRONFANS-205-Robin' (#729) from feat-IRONFANS-205-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/729
2024-09-11 11:29:30 +08:00
chenhao 7fa78ee5d9 Merge pull request 'feat-IRONFANS-210-Robin' (#728) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/728
2024-09-11 11:29:13 +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 1d7422d735 Merge pull request 'by Robin at 20240911; vdmdbug' (#727) from BUG-20240911-vd into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/727
2024-09-11 11:01:21 +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 e06fe1ba36 Merge branch 'dev_fix_fill' into test 2024-09-10 18:50:14 +08:00