wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,058 Commits 89 Branches 0 Tags 39 MiB
Commit Graph

1058 Commits

Author SHA1 Message Date
Leufolium aca9281087 by Robin at 20240501; fix upload fail video mod 2024-05-01 01:54:47 +08:00
chenhao e2501b7022 Merge pull request 'by Robin at 20240501' (#390) from feat-IRONFANS-86-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/390
 2024-05-01 01:11:22 +08:00
Leufolium d642ca7dc0 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-05-01 01:11:00 +08:00
Leufolium 6158600853 by Robin at 20240501 2024-05-01 01:04:50 +08:00
chenhao f4494cbabc Merge pull request 'conflict' (#388) from conflict into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/388
 2024-04-30 09:53:07 +08:00
Leufolium 7e71e670c0 Merge branch 'feat-IRONFANS-70' into conflict 2024-04-30 09:52:51 +08:00
Leufolium 1ac73882d1 by Robin at 20240430 2024-04-30 09:51:23 +08:00
Leufolium aa32674ed3 by Robin at 20240430 2024-04-30 09:40:19 +08:00
chenhao cd4cff4d93 Merge pull request 'main' (#386) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/386
 2024-04-30 09:25:00 +08:00
chenhao b0fc62679e Merge pull request 'by Robin at 20240430' (#385) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/385
 2024-04-30 09:23:24 +08:00
Leufolium 7f18d00df4 by Robin at 20240430 2024-04-30 09:22:18 +08:00
chenhao edbcabb372 Merge pull request 'feat-IRONFANS-86-Robin' (#384) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/384
 2024-04-29 22:37:25 +08:00
chenhao a3c29a0c6b Merge pull request 'feat-IRONFANS-86-Robin' (#383) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/383
 2024-04-29 22:37:06 +08:00
Leufolium 07aff915c0 b 2024-04-29 22:36:45 +08:00
Leufolium 4f20828005 by Robin at 20240429 2024-04-29 22:36:16 +08:00
chenhao c366a96735 Merge pull request 'by Robin at 20240429' (#381) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/381
 2024-04-29 22:32:32 +08:00
chenhao 9356387298 Merge pull request 'by Robin at 20240429' (#380) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/380
 2024-04-29 22:32:05 +08:00
Leufolium bd0fb55e8e by Robin at 20240429 2024-04-29 22:31:27 +08:00
chenhao bee0278f38 Merge pull request 'by Robin at 20240429' (#379) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/379
 2024-04-29 22:21:38 +08:00
chenhao 9c893d4a9c Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
 2024-04-29 22:20:05 +08:00
Leufolium 86bc5933e4 by Robin at 20240429 2024-04-29 22:17:19 +08:00
lwl0608 0e8beef47b Merge branch 'dev-lwl/zone' into test 2024-04-29 17:53:01 +08:00
lwl0608 924656e8ed contact 2024-04-29 17:52:52 +08:00
lwl0608 3dc8a84b7c Merge branch 'dev-lwl/zone' into test 2024-04-29 17:39:59 +08:00
lwl0608 715ff91c51 zone_refund_list 2024-04-29 17:39:49 +08:00
lwl0608 9e4a6e744a Merge branch 'dev-lwl/zone' into test 2024-04-29 16:25:30 +08:00
lwl0608 f12a1ad2a2 fix coin order 2024-04-29 16:24:59 +08:00
lwl0608 f575f381e6 fix coin order 2024-04-29 16:23:03 +08:00
lwl0608 1b17cf1a79 Merge branch 'dev-lwl/zone' into test 2024-04-29 16:08:59 +08:00
lwl0608 cc7a910b72 fix zone ferund 2024-04-29 16:08:51 +08:00
lwl0608 31c2dc1039 Merge branch 'dev-lwl/zone' into test 2024-04-29 15:56:49 +08:00
lwl0608 a8d3a45b71 rollback ironfanship 2024-04-29 15:56:42 +08:00
lwl0608 1bd1cfd161 Merge branch 'dev-lwl/zone' into test 2024-04-29 15:47:56 +08:00
lwl0608 c470a8e77f add zone refund 2024-04-29 15:47:45 +08:00
chenhao 8ae3052741 Merge pull request 'feat-IRONFANS-86-Robin' (#377) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/377
 2024-04-29 15:32:43 +08:00
Leufolium b67c503e80 by Robin at 20240429 2024-04-29 15:31:54 +08:00
chenhao 1313f17fe0 Merge pull request 'by Robin at 20240429' (#376) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/376
 2024-04-29 14:25:16 +08:00
chenhao a167a0ddff Merge pull request 'by Robin at 20240429' (#375) from feat-IRONFANS-87-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/375
 2024-04-29 14:25:08 +08:00
Leufolium 29f4a72c32 by Robin at 20240429 2024-04-29 14:24:31 +08:00
chenhao 06624dc801 Merge pull request 'by Robin at 20240429' (#374) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/374
 2024-04-29 14:18:23 +08:00
chenhao db6176f021 Merge pull request 'by Robin at 20240429' (#373) from feat-IRONFANS-87-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/373
 2024-04-29 14:17:55 +08:00
Leufolium f6c60cf574 by Robin at 20240429 2024-04-29 14:17:29 +08:00
chenhao 419e3fb0f3 Merge pull request 'feat-IRONFANS-87-Robin' (#372) from feat-IRONFANS-87-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/372
 2024-04-28 22:03:48 +08:00
chenhao d24b4380a4 Merge pull request 'by Robin at 20240428' (#371) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/371
 2024-04-28 21:51:32 +08:00
Leufolium 58a238e9c9 by Robin at 20240428 2024-04-28 21:51:16 +08:00
chenhao 1810864112 Merge pull request 'by Robin at 20240428' (#370) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/370
 2024-04-28 21:33:38 +08:00
Leufolium 217a53d6b2 by Robin at 20240428 2024-04-28 21:33:24 +08:00
chenhao cab56b3a51 Merge pull request 'by Robin at 20240428' (#369) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/369
 2024-04-28 21:33:06 +08:00
Leufolium 24735fa03e by Robin at 20240428 2024-04-28 21:32:52 +08:00
chenhao e56dd98007 Merge pull request 'feat-IRONFANS-87-Robin' (#368) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/368
 2024-04-28 21:27:24 +08:00