Commit Graph

644 Commits

Author SHA1 Message Date
chenhao ff6023a7f1 Merge pull request 'mainconflict' (#192) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/192
2024-03-19 00:02:17 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 6bda0929d9 Merge pull request 'feat-IRONFANS-66-Robin' (#189) from feat-IRONFANS-66-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/189
2024-03-18 23:51:52 +08:00
Leufolium d2f961a2d4 1 2024-03-18 23:51:31 +08:00
Leufolium ec2bad2abf by 2024-03-18 23:36:53 +08:00
Leufolium 2b5396d96b by robin at 20240318; alter text for punishing 2024-03-18 23:34:49 +08:00
chenhao c7ced3c1a4 Merge pull request 'BUG-20240316-0001-Robin' (#187) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/187
2024-03-17 00:42:52 +08:00
Leufolium 776f52c177 加json字段 2024-03-17 00:42:26 +08:00
Leufolium 5ca57d639f ret 2024-03-17 00:32:47 +08:00
chenhao 0107f8f417 Merge pull request '1' (#186) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/186
2024-03-17 00:31:13 +08:00
Leufolium 8c82c59384 1 2024-03-17 00:31:02 +08:00
chenhao 7dab8f992c Merge pull request '1' (#185) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/185
2024-03-17 00:25:52 +08:00
Leufolium f2c294b379 1 2024-03-17 00:25:37 +08:00
chenhao 4abf690044 Merge pull request 'by Robin at 20240316; alter account search expr' (#184) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/184
2024-03-16 23:56:34 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
lwl0608 e734e3b653 mongodb 迁移 2024-03-16 17:10:58 +08:00
Leufolium 5ccad2cbca by Robin at 20240315 2024-03-15 21:18:11 +08:00
Leufolium a10ce673ec by Robin at 20240315; alter upper bound 2024-03-15 21:13:57 +08:00
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
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
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
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +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
Leufolium db9d6b2b0b by Robin at 20240308 2024-03-08 22:36:16 +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
Leufolium 30bcd59226 by Robin at 20240308,up op refreshes bottom flag 2024-03-08 15:43:15 +08:00
Leufolium 5f253ab9d3 fix 2024-03-08 15:22:33 +08:00
Leufolium 81d0858aad by 2024-03-08 15:21:52 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
Leufolium 5a965d4f75 by Robin at 20240308 2024-03-08 01:38:07 +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 3273330c76 refund 2024-03-07 19:39:33 +08:00
Leufolium a1a4820b2c by Robin at 20240307 alter streamer cancel text 2024-03-07 02:17:24 +08:00
Leufolium 279263fd54 d 2024-03-07 01:49:37 +08:00
Leufolium 8dfbc2326b by Robin at 20240307 2024-03-07 01:43:30 +08:00