 Leufolium
|
b4bd78c501
|
2
|
2024-07-23 17:42:43 +08:00 |
|
Leufolium
|
9d7581b521
|
Merge remote-tracking branch 'origin/main' into mainconf
|
2024-07-23 17:41:08 +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 |
|
chenhao
|
4650f3df48
|
Merge pull request 'conf' (#642) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/642
|
2024-07-23 16:42:15 +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 |
|
chenhao
|
8fabca75cd
|
Merge pull request 'BUG-20240722' (#640) from BUG-20240722 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/640
|
2024-07-22 19:31:14 +08:00 |
|
Leufolium
|
2c2564d9dc
|
1
|
2024-07-22 19:30:57 +08:00 |
|
Leufolium
|
9bec776bdf
|
1
|
2024-07-22 19:30:39 +08:00 |
|
chenhao
|
cb17db47a2
|
Merge pull request 'by Robin at 20240722; fixed Location err' (#639) from BUG-20240722 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/639
|
2024-07-22 19:23:34 +08:00 |
|
Leufolium
|
b1756d3c3d
|
by Robin at 20240722; fixed Location err
|
2024-07-22 19:23:13 +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 |
|
chenhao
|
95f63c2754
|
Merge pull request 'conflict' (#636) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/636
|
2024-07-22 16:02:57 +08:00 |
|
Leufolium
|
4540f29515
|
Merge branch 'feat-IRONFANS-173-Robin' into conflict
|
2024-07-22 16:02:15 +08:00 |
|
Leufolium
|
c3ff7fae4a
|
1
|
2024-07-22 15:59:45 +08:00 |
|
Leufolium
|
e57b0d96d1
|
1
|
2024-07-22 15:58:02 +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 |
|
chenhao
|
b72f2b19f8
|
Merge pull request '1' (#634) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/634
|
2024-07-20 10:22:21 +08:00 |
|
Leufolium
|
4df038ad9e
|
1
|
2024-07-20 10:21:45 +08:00 |
|
Leufolium
|
8ce679e746
|
1
|
2024-07-19 22:54:22 +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 |
|
chenhao
|
f26bf91807
|
Merge pull request '1' (#633) from feat-IRONFANS-163-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/633
|
2024-07-19 19:13:40 +08:00 |
|
Leufolium
|
3b8ed9a4e1
|
1
|
2024-07-19 19:13:02 +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 |
|
lwl0608
|
ab6422c107
|
Merge branch 'dev-lwl/rollback_zone_status' into test
|
2024-07-19 17:46:37 +08:00 |
|
lwl0608
|
9157c5fa08
|
fix
|
2024-07-19 17:46:33 +08:00 |
|
lwl0608
|
92a44fb645
|
fix token
|
2024-07-19 15:16:45 +08:00 |
|
lwl0608
|
53ae309348
|
merge
|
2024-07-19 11:03:20 +08:00 |
|
lwl0608
|
9c2ba123a2
|
rollback_zone_exit_status
|
2024-07-19 11:02:34 +08:00 |
|
Leufolium
|
98c6ef4f36
|
1
|
2024-07-19 08:43:30 +08:00 |
|
Leufolium
|
ea7d25b0a9
|
by Robin at 20240719
|
2024-07-19 08:32:59 +08:00 |
|
Leufolium
|
47af5ca2f0
|
Merge branch 'feat-IRONFANS-163-Robin' into test
|
2024-07-18 22:28:42 +08:00 |
|
chenhao
|
1dd0fdcf08
|
Merge pull request '1:20 lanxing:miyuan' (#630) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/630
|
2024-07-18 22:28:10 +08:00 |
|
Leufolium
|
494d798351
|
1
|
2024-07-18 22:27:36 +08:00 |
|
Leufolium
|
0665b22b3f
|
Merge branch 'main' into feat-IRONFANS-163-Robin
|
2024-07-18 22:27:10 +08:00 |
|
Leufolium
|
303b61ebda
|
1
|
2024-07-18 22:20:05 +08:00 |
|
Leufolium
|
b65118375b
|
Merge branch 'feat-IRONFANS-163-Robin' into test
|
2024-07-18 22:14:06 +08:00 |