Commit Graph

1573 Commits

Author SHA1 Message Date
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +08:00
Leufolium 0277f51c12 Merge remote-tracking branch 'origin/main' into mtest 1 2024-11-01 16:28:07 +08:00
Leufolium 1abe2c1cfb by Robin at 20241101 2024-11-01 16:09:59 +08:00
Leufolium 680cefa724 1 2024-11-01 15:35:45 +08:00
chenhao 6f3d4a9527 Merge pull request '1' (#776) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/776
2024-10-30 17:29:00 +08:00
Leufolium 6824ec209c 1 2024-10-30 17:28:43 +08:00
chenhao 4a50dfed50 Merge pull request 'by Robin at 20241030' (#775) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/775
2024-10-30 17:23:05 +08:00
Leufolium 7ba93214e2 by Robin at 20241030 2024-10-30 17:22:38 +08:00
chenhao bd60e02d8f Merge pull request '1' (#774) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/774
2024-10-29 17:23:19 +08:00
Leufolium 79fde24cee 1 2024-10-29 17:22:45 +08:00
Leufolium 5bad31df47 Merge branch 'feat-IRONFANS-212-Robin' into conf-IRONFANS-212 2024-10-29 14:59:50 +08:00
Leufolium 8fdac4d4f2 by Robin at 20241029 2024-10-29 14:57:22 +08:00
Leufolium b1e1ef2db9 Merge branch 'feat-IRONFANS-231-Robin' into main-IRONFANS-231 2024-10-22 16:01:05 +08:00
chenhao bd8652f824 Merge pull request 'feat-IRONFANS-231-Robin' (#769) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/769
2024-10-22 15:53:56 +08:00
Leufolium 3a69a803ae 1 2024-10-22 15:53:41 +08:00
chenhao 742e1318b7 Merge pull request 'by Robin at 20241022' (#768) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/768
2024-10-22 15:52:31 +08:00
Leufolium c460f0974f by Robin at 20241022 2024-10-22 15:52:06 +08:00
Leufolium cb91af63e3 Merge branch 'feat-IRONFANS-231-Robin' into conflict-IRONFANS-231 2024-10-22 15:38:23 +08:00
Leufolium 461a741c2c by Robin at 20241022 2024-10-22 15:36:18 +08:00
lwl0608 c5bceacb14 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-22 14:40:31 +08:00
lwl0608 7afa5f69fe add is_superfanship_give_wechat 2024-10-22 14:40:15 +08:00
Leufolium 5e96d99441 Merge branch 'feat-IRONFANS-212-Robin' into conflict-IRONFANS-212 2024-10-22 13:30:35 +08:00
Leufolium 5d4ff4fb54 by Robin at 20241022 2024-10-22 13:27:02 +08:00
Leufolium 7b442442b7 1 2024-10-21 16:08:28 +08:00
Leufolium a5f6c2d931 by Robin at 20241021 2024-10-21 16:07:56 +08:00
Leufolium c3fa461b9a 1 2024-10-21 14:36:01 +08:00
Leufolium bcf4d6b6b3 1 2024-10-18 16:41:12 +08:00
Leufolium b5979089b9 by Robin at 20241018 2024-10-18 16:41:06 +08:00
Leufolium 4fb589541b 1 2024-10-18 10:45:27 +08:00
Leufolium 9ca3ba48dc Merge remote-tracking branch 'origin/feat-IRONFANS-231-Robin' into release-20241017 2024-10-17 20:25:25 +08:00
Leufolium 50df41672d Merge branch 'feat-IRONFANS-210-Robin' into release-20241017 2024-10-17 20:24:15 +08:00
Leufolium 605eda4830 1 2024-10-17 20:05:06 +08:00
Leufolium 83a984eb17 by Robin at 20241017 2024-10-17 19:52:33 +08:00
Leufolium 9ebe86919d by Robin at 20241017 2024-10-17 16:30:32 +08:00
Leufolium 9d9209be23 by Robin at 20241017; notif center logic 2024-10-17 15:51:27 +08:00
Leufolium 2df2341e6b Merge branch 'feat-IRONFANS-210-Robin' into conf-IRONFANS-210 2024-10-17 11:24:22 +08:00
Leufolium ee3a73d695 by Robin at 20241017 2024-10-17 11:22:49 +08:00
Leufolium f30f710981 1 2024-10-17 10:35:39 +08:00
chenhao 7a29452719 Merge pull request '1' (#757) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/757
2024-10-16 17:40:42 +08:00
Leufolium 7d80e09e44 1 2024-10-16 17:40:24 +08:00
Leufolium 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32:52 +08:00
Leufolium eafb373bd4 by Robin at 20241016 2024-10-16 17:26:37 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +08:00
Leufolium 698a90904b 1 2024-10-16 15:32:17 +08:00
Leufolium 053045854d by Robin at 20241016 2024-10-16 15:32:12 +08:00
Leufolium ae74496934 1 2024-10-16 14:46:13 +08:00
Leufolium 3f10ab9330 by Robin at 20241015 2024-10-15 18:07:47 +08:00
chenhao 7372af7040 Merge pull request 'by Robin at 20241015' (#753) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/753
2024-10-15 16:02:45 +08:00
Leufolium 57f1775a2c by Robin at 20241015 2024-10-15 16:02:08 +08:00
Leufolium efb929e7ac by Robin at 20241015 2024-10-15 15:11:14 +08:00
Leufolium 357ee2a3be 1 2024-10-14 13:39:19 +08:00
lwl0608 c72f0555a1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-12 16:34:07 +08:00
lwl0608 a1a414d6da fix 2024-10-12 16:33:58 +08:00
lwl0608 03d2923a7f freeze 2024-10-11 16:33:25 +08:00
lwl0608 cc1c626292 merge 2024-10-11 16:27:30 +08:00
lwl0608 aed10596a3 freeze_apollo 2024-10-11 16:26:41 +08:00
Leufolium 5295ffb251 Merge branch 'feat-IRONFANS-229-Robin' into conflict 2024-10-11 15:26:52 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +08:00
chenhao 3e578f080b Merge pull request 'by Robin at 20241011' (#746) from feat-IRONFANS-228-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/746
2024-10-11 13:44:19 +08:00
Leufolium c34a0f25f8 by Robin at 20241011 2024-10-11 13:43:45 +08:00
lwl0608 bef99c9ee1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-11 00:37:04 +08:00
lwl0608 3d3513dcef fix 2024-10-11 00:37:00 +08:00
lwl0608 52811bbc7a Merge branch 'dev-lwl/unlock_opt' into test 2024-10-10 09:17:12 +08:00
lwl0608 0ca8714f12 freeze opt 2024-10-10 09:17:07 +08:00
lwl0608 45bbf40bf3 merge 2024-10-10 09:00:04 +08:00
lwl0608 cbf4cc764c freeze op 2024-10-10 08:59:27 +08:00
lwl0608 5371b90a1f Merge branch 'dev-lwl/freeze_func' into test 2024-10-10 08:26:09 +08:00
lwl0608 9f0c598e40 add freeze mid 513920 2024-10-10 08:26:05 +08:00
lwl0608 62e021dc6a Merge branch 'dev-lwl/freeze_func' into test 2024-10-09 21:07:44 +08:00
lwl0608 9836c10abe add freeze mid 2024-10-09 21:07:32 +08:00
lwl0608 2bc8ce98bd init 2024-10-09 21:06:26 +08:00
Leufolium 4fc15bcf79 by Robin at 20241004 2024-10-04 17:17:21 +08:00
Leufolium 32d3d8ec01 by Robin at 20241004 2024-10-04 17:16:43 +08:00
chenhao 3c9e3303d8 Merge pull request 'BUG-20241004-Robin' (#743) from BUG-20241004-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/743
2024-10-04 17:10:35 +08:00
Leufolium e6794cf887 by Robin at 20241004; fix 2024-10-04 17:10:14 +08:00
lwl0608 9be64dca0c Merge branch 'dev-lwl/withdraw' 2024-09-28 21:31:16 +08:00
lwl0608 256706000f withdraw 2024-09-28 21:31:04 +08:00
lwl0608 9ed151c9d8 withdraw 2024-09-28 21:30:49 +08:00
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 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
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +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
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
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