Commit Graph

1230 Commits

Author SHA1 Message Date
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
Leufolium 279263fd54 d 2024-03-07 01:49:37 +08:00
chenhao 365b860df3 Merge pull request 'feat-IRONFANS-62-Robin' (#158) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/158
2024-03-07 01:46:51 +08:00
Leufolium 8dfbc2326b by Robin at 20240307 2024-03-07 01:43:30 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
chenhao 08f457a4ba Merge pull request 'feat-IRONFANS-62-Robin' (#157) from feat-IRONFANS-62-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/157
2024-03-06 20:08:27 +08:00
Leufolium e5bc859d98 by Robin at 20240306; mix test sql conn info 2024-03-06 20:07:34 +08:00
chenhao e95ca7f4f1 revert 5fab9ff0fd
revert By Robin at 20240304; cancel account function at mongo part
2024-03-05 13:21:22 +08:00
Leufolium 5fab9ff0fd By Robin at 20240304; cancel account function at mongo part 2024-03-04 19:21:30 +08:00
chenhao fe3e1c35be Merge pull request 'by Robin at 20240302' (#156) from feat-IRONFANS-61-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/156
2024-03-02 08:29:46 +08:00
Leufolium b2b29d7466 by Robin at 20240302 2024-03-02 08:29:20 +08:00
chenhao a41a571e85 Merge pull request 'feat-IRONFANS-61-Robin' (#155) from feat-IRONFANS-61-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/155
2024-02-29 11:28:12 +08:00
chenhao 20a97b8ba7 Merge pull request 'feat-IRONFANS-61-Robin' (#154) from feat-IRONFANS-61-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/154
2024-02-29 11:23:45 +08:00
Leufolium b41aad7e4e 1 2024-02-29 11:22:33 +08:00
Leufolium b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00
chenhao 602b8b5d8b Merge pull request 'conflict' (#153) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/153
2024-02-29 10:57:48 +08:00
Leufolium 32c5541cdb Merge branch 'feat-IRONFANS-61-Robin' into conflict 2024-02-29 10:54:09 +08:00
Leufolium 9f924901ec by Robin at 20240229; fix 2024-02-29 10:49:54 +08:00
Leufolium 0e297f564c by Robin at 20240229; fix 2024-02-29 10:34:21 +08:00
Leufolium b2c8a76e37 by Robin at 20240229; add robot 2024-02-29 09:55:56 +08:00
chenhao 757739b646 Merge pull request 'by Robin at 20240229; fix' (#151) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/151
2024-02-29 02:05:33 +08:00
chenhao e0ffa31e10 Merge pull request 'by Robin at 20240229; fix' (#150) from feat-20240117-001-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/150
2024-02-29 02:05:24 +08:00
Leufolium eec07ab1d7 by Robin at 20240229; fix 2024-02-29 02:05:10 +08:00
chenhao a1f3e5b4ff Merge pull request 'by Robin at 20240229; fix' (#149) from feat-20240117-001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/149
2024-02-29 01:50:14 +08:00