Commit Graph

117 Commits

Author SHA1 Message Date
Leufolium 14d86ae777 by Robin at 20240427 2024-04-27 08:20:19 +08:00
chenhao fe866863e6 Merge pull request 'feat-IRONFANS-70' (#330) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/330
2024-04-25 10:02:45 +08:00
Leufolium 3fef23d3c3 by Robin at 20240425 2024-04-25 10:01:34 +08:00
chenhao bfc84392aa Merge pull request 'feat-IRONFANS-70' (#320) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/320
2024-04-22 19:37:08 +08:00
Leufolium 312c078216 by Robin at 20240422 2024-04-22 19:21:14 +08:00
chenhao 7696327333 Merge pull request 'feat-IRONFANS-70' (#315) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/315
2024-04-22 18:34:16 +08:00
Leufolium bf1de24bcd by Robin at 20240422 2024-04-22 18:33:40 +08:00
chenhao 7601fd548c Merge pull request 'feat-IRONFANS-70' (#311) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/311
2024-04-22 07:21:38 +08:00
Leufolium d762f5df3a by Robin at 20240422 2024-04-22 07:21:16 +08:00
chenhao cb592d0113 Merge pull request 'feat-IRONFANS-70' (#305) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/305
2024-04-18 17:43:42 +08:00
Leufolium 460153a394 by Robin at 20240418 2024-04-18 17:43:12 +08:00
chenhao a1d6d0eda1 Merge pull request 'feat-IRONFANS-70' (#290) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/290
2024-04-16 07:43:02 +08:00
Leufolium da6d60020c by Robin at 20240416 2024-04-16 07:41:52 +08:00
chenhao a7f9a76be0 Merge pull request 'feat-IRONFANS-70' (#268) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/268
2024-04-11 19:35:23 +08:00
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
Leufolium e985e15ae1 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf 2024-04-08 20:14:44 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 5a333382ff Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf 2024-04-05 17:11:18 +08:00
Leufolium 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium be27160261 Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict 2024-04-03 16:55:08 +08:00
Leufolium 15bb43afdf by Robin at 20240402 2024-04-02 22:47:41 +08:00
Leufolium a31e57c806 by Robin at 20240402 2024-04-02 18:53:26 +08:00
Leufolium a69bcdb6a2 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-01 11:19:10 +08:00
Leufolium dc65d4f32e Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-04-01 11:18:03 +08:00
Leufolium 113cf31495 Merge remote-tracking branch 'origin/main' into test 2024-03-28 12:12:05 +08:00
Leufolium b67808caca by Robin at 20240327 2024-03-27 19:34:16 +08:00
Leufolium f7472ea634 by Robin at 20240326 2024-03-26 12:31:00 +08:00
Leufolium 594987f8ac by Robin at 20240326; alter 2024-03-26 12:29:53 +08:00
Leufolium 5344a54888 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict 2024-03-22 13:54:11 +08:00
Leufolium 407292fe8d by Robin at 20240321 2024-03-21 23:26:23 +08:00
Leufolium a364553c0c by Robin at 20240320 2024-03-20 10:06:26 +08:00
Leufolium 3d09829521 1 2024-03-19 00:05:23 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 6518d37c1f Merge pull request 'feat-IRONFANS-66-Robin' (#188) from feat-IRONFANS-66-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/188
2024-03-18 23:43:13 +08:00
Leufolium ec2bad2abf by 2024-03-18 23:36:53 +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
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
Leufolium 960adc1455 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-08 01:30:30 +08:00
Leufolium 7dec418bfa by Robin at 20240308 2024-03-08 00:42:42 +08:00
Leufolium a1a4820b2c by Robin at 20240307 alter streamer cancel text 2024-03-07 02:17:24 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +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
Leufolium cd07846804 by Robin at 20240222; fix 2024-02-22 21:50:34 +08:00
Leufolium 5079d25bb3 Merge remote-tracking branch 'origin/main' into feat-20240117-001-Robin 2024-02-07 13:51:00 +08:00
Leufolium 12870ef2fd by Robin at 20240207; add aligned 2024-02-07 12:07:28 +08:00
Leufolium 96d6c8e703 by Robin at 20240205; content 2024-02-05 22:12:47 +08:00
chenhao 2be2b3f4a7 revert 21c4f6f18d
revert by Robin at 20240205; content
2024-02-05 22:11:49 +08:00
Leufolium 21c4f6f18d by Robin at 20240205; content 2024-02-05 22:11:00 +08:00
Leufolium 01092097c8 by Robin at 20240205 2024-02-05 21:18:27 +08:00
Leufolium c71c996afd by Robin at 20240201; 2024-02-01 09:52:45 +08:00
chenhao f724fed644 Merge pull request 'feat-20230112-001-Robin' (#67) from feat-20230112-001-Robin into main
Reviewed-on: #67
2024-01-23 17:56:14 +08:00
Leufolium 26c55749a0 by Robin at 20240113; moment 2024-01-13 00:32:19 +08:00
Leufolium 1f6a083f93 by Robin at 20240110; login add inviter field 2024-01-10 23:19:34 +08:00
lwl0608 9ee9789d03 msg 2024-01-08 22:42:10 +08:00
lwl0608 ca0ed7bec9 apply time 2024-01-08 22:38:18 +08:00
lwl0608 537ed90d65 withdraw apply 2024-01-08 11:49:16 +08:00
Leufolium 3cc042ba66 by Robin at 20230103; add daily statement 2024-01-03 16:16:41 +08:00
Leufolium 5945014c7e by Robin at 20231231; fix not enabled info 2023-12-31 13:44:04 +08:00
Leufolium b0d29a76db by Robin at 20231230; fix 2023-12-30 19:28:50 +08:00
lwl0608 5d8fda536a add check 2023-12-29 21:30:59 +08:00
Leufolium d70664c98b by Robin at 20231225; approval text 2023-12-25 10:36:48 +08:00
Leufolium 87cf6ecb49 by Robin at 20231224; inviter 2023-12-24 02:02:20 +08:00
Leufolium 7ea7b36776 by Robin at 20231223; contact session 2023-12-23 22:03:53 +08:00
lwl0608 9a00286db6 service 2023-12-21 22:17:40 +08:00