 Leufolium
|
44b37b1ad0
|
Merge branch 'feat-IRONFANS-176-Robin' into conflict
|
2024-07-30 18:58:16 +08:00 |
|
Leufolium
|
7af7d2d6f1
|
by Robin at 20240730
|
2024-07-30 18:40:15 +08:00 |
|
Leufolium
|
d9ef34138b
|
1
|
2024-07-30 15:35:27 +08:00 |
|
chenhao
|
3d89cdb07c
|
Merge pull request 'by Robin at 20240730; add delay' (#657) from feat-IRONFANS-166-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/657
|
2024-07-30 12:15:35 +08:00 |
|
Leufolium
|
c6e1a41288
|
by Robin at 20240730; add delay
|
2024-07-30 12:15:01 +08:00 |
|
Leufolium
|
2e08c98384
|
1
|
2024-07-30 12:08:21 +08:00 |
 lwl0608
|
e1d63b08d6
|
Merge branch 'add_raven' into test
|
2024-07-29 19:29:40 +08:00 |
|
lwl0608
|
739cc1dd11
|
fix outer raven
|
2024-07-29 19:29:34 +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 |
|
Leufolium
|
5eeebd4206
|
by Robin at 20240729
|
2024-07-29 13:15:11 +08:00 |
|
chenhao
|
a7f3d8f813
|
Merge pull request 'by Robin at 20240726' (#655) from feat-IRONFANS-166-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/655
|
2024-07-26 12:59:23 +08:00 |
|
Leufolium
|
ae595246be
|
by Robin at 20240726
|
2024-07-26 12:58:48 +08:00 |
|
Leufolium
|
c2f89ac8e9
|
Merge branch 'feat-IRONFANS-166-Robin' into conf
|
2024-07-25 21:38:19 +08:00 |
|
Leufolium
|
34bbcdf627
|
1
|
2024-07-25 21:37:50 +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
|
bb2c18fa4b
|
1
|
2024-07-25 20:11:38 +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 |
|
lwl0608
|
fc37a1595f
|
Merge branch 'fix_panicc' into test
|
2024-07-24 16:42:57 +08:00 |
|
lwl0608
|
33e8d70e24
|
fix panic
|
2024-07-24 16:42:49 +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 |
|
chenhao
|
0defd56c6b
|
Merge pull request '1' (#643) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/643
|
2024-07-23 17:04:23 +08:00 |
|
Leufolium
|
c5343564e3
|
1
|
2024-07-23 17:04:07 +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 |
|
chenhao
|
b87106fa8f
|
Merge pull request '1' (#637) from feat-IRONFANS-173-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/637
|
2024-07-22 16:12:37 +08:00 |
|
Leufolium
|
6b800705c5
|
1
|
2024-07-22 16:12:22 +08:00 |
|
Leufolium
|
4540f29515
|
Merge branch 'feat-IRONFANS-173-Robin' into conflict
|
2024-07-22 16:02:15 +08:00 |
|
Leufolium
|
de7adf04e8
|
1
|
2024-07-22 15:57:56 +08:00 |
|
Leufolium
|
62efdad5c0
|
1
|
2024-07-22 13:45:57 +08:00 |
|
Leufolium
|
b283c34f44
|
by Robin at 20240722
|
2024-07-22 09:17:49 +08:00 |
|
lwl0608
|
9808ff020f
|
Merge branch 'dev-lwl/rollback_zone_status'
|
2024-07-19 20:37:20 +08:00 |
|
lwl0608
|
ebd161ba90
|
Merge branch 'dev-lwl/rollback_zone_status' into test
|
2024-07-19 20:37:13 +08:00 |
|
lwl0608
|
bf994af7ab
|
fix errmsg
|
2024-07-19 20:37:08 +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 |
|
lwl0608
|
34c0a92991
|
Merge branch 'dev-lwl/rollback_zone_status' into test
|
2024-07-19 17:54:07 +08:00 |
|
lwl0608
|
4211c887cf
|
fix
|
2024-07-19 17:53:54 +08:00 |
|
Leufolium
|
de756dab19
|
1
|
2024-07-19 17:46:58 +08:00 |