Commit Graph

703 Commits

Author SHA1 Message Date
chenhao a9231869d8 Merge pull request 'mainconflict' (#179) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/179
2024-03-15 00:45:53 +08:00
Leufolium b8dc1a7a1b Merge remote-tracking branch 'origin/testonly-vericode_create' into mainconflict 2024-03-15 00:45:38 +08:00
chenhao 2783a4f25a Merge pull request 'conflict' (#177) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/177
2024-03-14 07:56:36 +08:00
Leufolium 1954e80ab3 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-14 07:55:43 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +08:00
lwl0608 7b4954bbf8 fix streamer id 2024-03-13 21:06:00 +08:00
lwl0608 371cf04c5f ch log 2024-03-13 20:51:29 +08:00
lwl0608 9e1a95bfe3 refund 2024-03-13 20:38:03 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
chenhao 4711e9e2e4 Merge pull request 'by Robin at 20240313; alter msg for permanent block' (#175) from feat-IRONFANS-66-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/175
2024-03-13 16:32:42 +08:00
Leufolium 3d0dbb6ca2 by Robin at 20240313; alter msg for permanent block 2024-03-13 16:31:51 +08:00
chenhao 5881859273 Merge pull request 'by Robin at 20240222; fix' (#174) from feat-IRONFANS-54-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/174
2024-03-12 23:49:14 +08:00
lwl0608 f781786e13 fix cdn 2024-03-12 21:21:46 +08:00
chenhao b49ed96c2a Merge pull request 'conflict' (#173) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/173
2024-03-12 12:13:47 +08:00
Leufolium f990dd0be0 Merge branch 'feat-IRONFANS-66-Robin' into conflict 2024-03-12 12:10:16 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
chenhao 0c3499f6a9 Merge pull request 'feat-IRONFANS-58-Robin' (#171) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/171
2024-03-08 23:03:50 +08:00
Leufolium d93e59e24f by Robin at 20240308; moment list by ids add follow 2024-03-08 23:03:20 +08:00
Leufolium 7497d4afe5 by Robin at 20240308; remove log 2024-03-08 22:46:49 +08:00
chenhao 758dc0ef66 Merge pull request 'by Robin at 20240308' (#170) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/170
2024-03-08 22:37:15 +08:00
Leufolium db9d6b2b0b by Robin at 20240308 2024-03-08 22:36:16 +08:00
chenhao cbc47a1f54 Merge pull request 'conflict' (#169) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/169
2024-03-08 21:22:07 +08:00
Leufolium 4cf49ad204 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 21:21:20 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
lwl0608 19f60097ff cdn test 2024-03-08 15:49:57 +08:00
lwl0608 93048a1a4b cdn test 2024-03-08 15:49:32 +08:00
chenhao b173c28626 Merge pull request 'by Robin at 20240308,up op refreshes bottom flag' (#167) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/167
2024-03-08 15:43:54 +08:00
Leufolium 30bcd59226 by Robin at 20240308,up op refreshes bottom flag 2024-03-08 15:43:15 +08:00
chenhao 11ddcd1c93 Merge pull request 'feat-IRONFANS-58-Robin' (#166) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/166
2024-03-08 15:22:51 +08:00
Leufolium 5f253ab9d3 fix 2024-03-08 15:22:33 +08:00
Leufolium 81d0858aad by 2024-03-08 15:21:52 +08:00
chenhao 2c7ffb40c9 Merge pull request 'by Robin at 20240308; add bottom flag' (#165) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/165
2024-03-08 15:15:49 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
chenhao 74c6061db0 Merge pull request 'by Robin at 20240308; logout' (#164) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/164
2024-03-08 12:52:59 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
chenhao acd2370031 Merge pull request 'feat-IRONFANS-58-Robin' (#162) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/162
2024-03-08 01:38:50 +08:00
Leufolium 5a965d4f75 by Robin at 20240308 2024-03-08 01:38:07 +08:00
chenhao 7732ce4ac4 Merge pull request 'conflict' (#163) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/163
2024-03-08 01:31:01 +08:00
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +08:00
Leufolium 23d64b3454 by Robin at 20240308 2024-03-08 01:25:43 +08:00
Leufolium 47ef06b88f by Robin at 20240308 2024-03-08 01:13:48 +08:00
Leufolium 9692680528 by 2024-03-08 00:59:20 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
chenhao a9161cfbd7 Merge pull request 'main' (#161) from main into feat-IRONFANS-58-Robin
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/161
2024-03-07 19:58:11 +08:00
lwl0608 614c93f962 cancel token 2024-03-07 19:40:15 +08:00
lwl0608 3273330c76 refund 2024-03-07 19:39:33 +08:00
chenhao 5103b853d8 Merge pull request 'by Robin at 20240307 alter streamer cancel text' (#160) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/160
2024-03-07 02:17:52 +08:00
Leufolium a1a4820b2c by Robin at 20240307 alter streamer cancel text 2024-03-07 02:17:24 +08:00
chenhao dcf617df52 Merge pull request 'd' (#159) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/159
2024-03-07 01:50:04 +08:00