Commit Graph

1523 Commits

Author SHA1 Message Date
Leufolium 2cde89a882 Merge remote-tracking branch 'origin/main' into test 2024-11-05 21:30:16 +08:00
Leufolium ba0a510301 1 2024-11-05 21:22:17 +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
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