wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,444 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

375 Commits

Author SHA1 Message Date
Leufolium 9277356df2 by Robin at 20241112 2024-11-12 17:37:18 +08:00
Leufolium b5f5a81915 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-11 15:17:31 +08:00
chenhao 135732a173 Merge pull request 'by Robin at 20241108' (#783) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/783
 2024-11-08 11:18:25 +08:00
Leufolium 747cc25edb by Robin at 20241108 2024-11-08 11:17:47 +08:00
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +08:00
Leufolium 9b830999aa by Robin at 20241107 2024-11-07 17:05:13 +08:00
Leufolium 0d0414b344 by Robin at 20241106 2024-11-06 17:37:46 +08:00
Leufolium 7a4199503d by Robin at 20241105 2024-11-05 11:44:33 +08:00
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +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
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 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 b5979089b9 by Robin at 20241018 2024-10-18 16:41:06 +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 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 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32:52 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +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
lwl0608 45bbf40bf3 merge 2024-10-10 09:00:04 +08:00
lwl0608 cbf4cc764c freeze op 2024-10-10 08:59:27 +08:00
lwl0608 2bc8ce98bd init 2024-10-09 21:06:26 +08:00
lwl0608 d5fc511403 Merge branch 'dev_lwl' into test 2024-09-18 22:29:20 +08:00
lwl0608 c80d1575f1 fix SrcVidMap 2024-09-18 22:29:12 +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
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
lwl0608 f94dec8f98 Merge branch 'dev_fix_fill' into test 2024-09-10 18:44:00 +08:00
lwl0608 2421f038e6 fix fill media 2024-09-10 18:43:55 +08:00
lwl0608 49f045202d Merge branch 'dev_search_zmember' into test 2024-09-10 18:13:04 +08:00
lwl0608 d30cac1c02 fix media 2024-09-10 18:12:57 +08:00
lwl0608 eedc49b4b2 main 2024-09-04 15:23:51 +08:00
Leufolium 715428a777 Merge branch 'feat-IRONFANS-212-Robin' into tconflict 2024-09-02 13:03:26 +08:00
Leufolium 19cccc907f by Robin at 20240902 2024-09-02 12:52:49 +08:00
Leufolium 61a54119b9 by Robin at 20240830 2024-08-30 16:34:00 +08:00
chenhao edac0076f8 Merge pull request 'by Robin at 20240829' (#711) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/711
 2024-08-29 16:05:31 +08:00
Leufolium 2a12aee170 by Robin at 20240829 2024-08-29 16:01:45 +08:00
Leufolium 288fa990c5 Merge branch 'feat-IRONFANS-210-Robin' into conflict 2024-08-23 16:20:39 +08:00
Leufolium 8bb1042d17 by Robin at 20240823 2024-08-23 16:17:32 +08:00
chenhao 25a5820fdf Merge pull request 'by Robin at 20240820' (#699) from feat-IRONFANS-198-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/699
 2024-08-20 17:39:15 +08:00
Leufolium 58e5c6ab1d by Robin at 20240820 2024-08-20 17:35:50 +08:00
Leufolium a771a1e89a Merge branch 'feat-IRONFANS-198-Robin' into test 2024-08-16 07:10:54 +08:00
Leufolium 4e0afaa067 by Robin at 20240815 2024-08-15 07:07:39 +08:00
lwl0608 a3a98587f3 merge 2024-08-14 11:02:26 +08:00
lwl0608 b6338fb391 search 2024-08-14 11:01:03 +08:00
chenhao 1b2d0e1a03 Merge pull request 'by Robin at 20240808' (#690) from feat-IRONFANS-191-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/690
 2024-08-08 16:05:20 +08:00
Leufolium 50d3ab3040 by Robin at 20240808 2024-08-08 16:04:50 +08:00
lwl0608 c6b9b4b40d Merge branch 'dev_lwl' into test 2024-08-03 18:09:18 +08:00
lwl0608 5afe4d6c4e add use src vd id list 2024-08-03 18:09:09 +08:00
Leufolium 98f605c265 Merge branch 'feat-IRONFANS-176-Robin' into mainconf 2024-08-01 22:34:08 +08:00
lwl0608 5f30544f99 fix ch 2024-08-01 14:38:55 +08:00
lwl0608 f8a4c0fbe7 Merge branch 'add_raven' 2024-08-01 10:35:00 +08:00
Leufolium 2793aff71d Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict 2024-07-31 22:14:57 +08:00
chenhao 4076be621a Merge pull request 'by Robin at 20240731' (#669) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/669
 2024-07-31 17:10:57 +08:00
Leufolium 73ada4aa6e by Robin at 20240731 2024-07-31 17:04:08 +08:00
chenhao 9fe110c035 Merge pull request 'feat-IRONFANS-166-Robin' (#661) from feat-IRONFANS-166-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/661
 2024-07-30 19:06:07 +08:00
Leufolium 44b37b1ad0 Merge branch 'feat-IRONFANS-176-Robin' into conflict 2024-07-30 18:58:16 +08:00
Leufolium 8fcef422bb by Robin at 20240729 2024-07-29 15:48:39 +08:00
lwl0608 940b5d7400 Merge branch 'add_raven' into test 2024-07-29 15:33:48 +08:00
lwl0608 759a138d06 outer raven 2024-07-29 15:33:42 +08:00
chenhao acf3e96a9d Merge pull request 'BUG-20240729' (#656) from BUG-20240729 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/656
 2024-07-29 13:15:38 +08:00
lwl0608 af2b7c9d18 fix 2024-07-28 14:53:34 +08:00
lwl0608 ac2053db11 fix 2024-07-28 14:21:24 +08:00
Leufolium 6310092360 Merge remote-tracking branch 'origin/feat-IRONFANS-166-Robin' into conf 2024-07-25 21:37:08 +08:00
Leufolium 8eec2ba0ee by Robin at 20240725 2024-07-25 21:35:25 +08:00
chenhao c137fd38bc Merge pull request 'feat-IRONFANS-173-Robin' (#650) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/650
 2024-07-25 20:28:48 +08:00
Leufolium 2ea3ebb6aa by Robin at 20240725 2024-07-25 19:59:35 +08:00
Leufolium 2a7c04d4ea 1 2024-07-25 17:49:13 +08:00
lwl0608 091a9b24a1 merg 2024-07-25 10:29:06 +08:00
lwl0608 cfdcc67c8f fix ch 2024-07-25 10:28:43 +08:00
chenhao ac6ee62ac6 Merge pull request 'By Robin at 20240724' (#649) from feat-IRONFANS-173-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/649
 2024-07-24 14:19:56 +08:00
Leufolium d74af2c693 By Robin at 20240724 2024-07-24 14:14:26 +08:00
Leufolium 9467b15d29 Merge branch 'feat-IRONFANS-163-Robin' into mainconf 2024-07-23 17:38:33 +08:00
Leufolium a491dff03a Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-23 16:41:47 +08:00
Leufolium 24b52988f2 by Robin at 20240723 2024-07-23 16:37:16 +08:00
Leufolium f83058dc25 Merge branch 'feat-IRONFANS-148-Robin' into mainconf 2024-07-22 19:11:15 +08:00
Leufolium 4540f29515 Merge branch 'feat-IRONFANS-173-Robin' into conflict 2024-07-22 16:02:15 +08:00
Leufolium b283c34f44 by Robin at 20240722 2024-07-22 09:17:49 +08:00
Leufolium 2167befc4d 1 2024-07-19 18:31:15 +08:00
chenhao 2738a1393b Merge pull request 'feat-IRONFANS-163-Robin' (#632) from feat-IRONFANS-163-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/632
 2024-07-19 18:12:01 +08:00
Leufolium 8ac99776b2 by Robin at 20240719 2024-07-19 18:11:32 +08:00
Leufolium de756dab19 1 2024-07-19 17:46:58 +08:00
Leufolium ea7d25b0a9 by Robin at 20240719 2024-07-19 08:32:59 +08:00
Leufolium 0665b22b3f Merge branch 'main' into feat-IRONFANS-163-Robin 2024-07-18 22:27:10 +08:00
Leufolium 74183a0331 by Robin at 20240718 2024-07-18 19:29:11 +08:00
Leufolium c6aa6c3c53 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 18:02:30 +08:00
Leufolium 02e9883ffe by Robin at 20240717 2024-07-17 17:55:46 +08:00
Leufolium 36f7b60923 Merge branch 'feat-IRONFANS-163-Robin' into conf 2024-07-17 13:00:51 +08:00
Leufolium 8fc078e3c9 by Robin at 20240717 2024-07-17 12:53:42 +08:00
Leufolium f1105391c3 by Robin at 20240717 2024-07-17 09:00:43 +08:00
Leufolium b3da7ede75 streameraudit 2024-07-17 08:58:12 +08:00