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

690 Commits

Author SHA1 Message Date
chenhao 329ebdae4f Merge pull request '1' (#834) from feat-IRONFANS-247-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/834
 2024-11-25 17:44:03 +08:00
Robin 1b10e71aa2 1 2024-11-25 17:42:51 +08:00
Robin de25330b3e 1 2024-11-25 17:40:43 +08:00
Robin 34759baafc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-25 17:12:59 +08:00
Robin 9e41c962e4 1 2024-11-25 17:10:27 +08:00
lwl0608 2e59c673b6 Merge branch 'dev-lwl/firenze' into test 2024-11-25 17:08:35 +08:00
lwl0608 f4380e6b52 firenze 2024-11-25 17:08:00 +08:00
Robin fa73de861f Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:25:44 +08:00
Robin e87795abd8 1 2024-11-25 15:25:00 +08:00
Robin fd0142a96a Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:24:18 +08:00
Robin 7957ee977b 1 2024-11-25 15:17:44 +08:00
Robin 10c733b972 by Robin at 20241125; guild registration 2024-11-25 15:15:29 +08:00
chenhao 7677ebe0dd Merge pull request 'BUG-20241119' (#818) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/818
 2024-11-21 14:48:14 +08:00
Robin 660d636141 1 2024-11-21 14:47:44 +08:00
chenhao e72f9f9614 Merge pull request 'by Robin at 20241121' (#817) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/817
 2024-11-21 14:17:10 +08:00
Leufolium 1ac849645c by Robin at 20241121 2024-11-21 14:15:55 +08:00
chenhao d4f38b5d34 Merge pull request 'by Robin at 20241120' (#816) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/816
 2024-11-20 18:38:01 +08:00
Leufolium 76fe6ef75e by Robin at 20241120 2024-11-20 18:36:35 +08:00
chenhao 160c54dfba Merge pull request 'BUG-20241119' (#810) from BUG-20241119 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/810
 2024-11-20 16:46:27 +08:00
Leufolium 067de8dcc4 by Robin at 20241120 2024-11-20 16:45:58 +08:00
Leufolium e014d2b80a Merge branch 'feat-IRONFANS-235-Robin' into test 2024-11-18 17:00:49 +08:00
chenhao 25352fbf06 Merge pull request '1' (#805) from feat-IRONFANS-235-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/805
 2024-11-18 16:57:04 +08:00
Leufolium c72afa8b57 1 2024-11-18 16:56:44 +08:00
chenhao dc82c76c4f Merge pull request 'feat-IRONFANS-235-Robin' (#804) from feat-IRONFANS-235-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/804
 2024-11-18 16:44:46 +08:00
Leufolium f6a60004fe Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 16:21:46 +08:00
Leufolium 5a88ba39ae 1 2024-11-18 16:18:38 +08:00
Leufolium 761499bef5 Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 15:18:49 +08:00
Leufolium 98cf6b3f4b by Robin at 20241118 2024-11-18 15:16:10 +08:00
Leufolium 5cb17dc87b Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-15 15:10:49 +08:00
Leufolium b7d941abe7 1 2024-11-15 15:01:07 +08:00
Leufolium 3a9b4a6827 by Robin at 20241115 2024-11-15 15:00:37 +08:00
Leufolium a74773681e by Robin at 20241114 2024-11-14 16:30:59 +08:00
Leufolium e57a2e4f55 by Robin at 20241113 2024-11-13 15:32:59 +08:00
chenhao 570d26463f Merge pull request '1' (#794) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/794
 2024-11-12 18:05:35 +08:00
Leufolium 49f0c03e70 1 2024-11-12 18:04:44 +08:00
chenhao f74a126912 Merge pull request 'feat-IRONFANS-212-Robin' (#793) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/793
 2024-11-12 17:38:29 +08:00
Leufolium 9277356df2 by Robin at 20241112 2024-11-12 17:37:18 +08:00
Leufolium 4606b327c5 Merge branch 'feat-IRONFANS-238-Robin' into feat-IRONFANS-212-Robin 2024-11-12 16:36:26 +08:00
Leufolium 0870b550b8 by Robin at 20241112 2024-11-12 16:34:26 +08:00
Leufolium b5f5a81915 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-11 15:17:31 +08:00
chenhao fa91563548 Merge pull request 'by Robin at 20241111' (#789) from feat-IRONFANS-238-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/789
 2024-11-11 13:46:32 +08:00
chenhao 76935fed75 Merge pull request '1' (#788) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/788
 2024-11-11 13:46:08 +08:00
Leufolium 14e4a6b09b 1 2024-11-11 13:45:37 +08:00
chenhao 498600ae10 Merge pull request 'feat-IRONFANS-212-Robin' (#786) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/786
 2024-11-11 13:42:23 +08:00
Leufolium 7ab72de288 1 2024-11-11 13:41:58 +08:00
Leufolium 43fd646524 by Robin at 20241111 2024-11-11 13:34:25 +08:00
Leufolium 06cf21e8d6 by Robin at 20241108; curry 2024-11-08 16:30:02 +08:00
chenhao 90583d5110 Merge pull request '1' (#784) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/784
 2024-11-08 11:20:18 +08:00
Leufolium 18f1a9156c 1 2024-11-08 11:20:02 +08:00
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +08:00
Leufolium 6706183f44 by Robin at 20241107 2024-11-07 17:20:34 +08:00
Leufolium 9b830999aa by Robin at 20241107 2024-11-07 17:05:13 +08:00
Leufolium 521d7694c2 by Robin at 20241107 2024-11-07 12:48:43 +08:00
Leufolium 0d0414b344 by Robin at 20241106 2024-11-06 17:37:46 +08:00
Leufolium 5954bea877 by Robin at 20241106 2024-11-06 13:50:29 +08:00
Leufolium eb611cb964 1 2024-11-05 16:33:40 +08:00
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +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
Leufolium 680cefa724 1 2024-11-01 15:35: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
lwl0608 5ab1402ca2 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-24 20:25:39 +08:00
lwl0608 c75543c9e6 add VO price_list 2024-10-24 20:25:30 +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 493ab2ac56 1 2024-10-22 15:53:16 +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
Leufolium 5e96d99441 Merge branch 'feat-IRONFANS-212-Robin' into conflict-IRONFANS-212 2024-10-22 13:30:35 +08:00
Leufolium 02ca375de8 1 2024-10-22 11:53:59 +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
chenhao c60194c221 Merge pull request 'conf-IRONFANS-210' (#760) from conf-IRONFANS-210 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/760
 2024-10-17 11:24:56 +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
chenhao c537d82329 Merge pull request '1' (#758) from feat-IRONFANS-231-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/758
 2024-10-16 17:44:11 +08:00
Leufolium 055bbcdf82 1 2024-10-16 17:43:52 +08:00
Leufolium 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32:52 +08:00
Leufolium d9902a3f60 1 2024-10-16 17:30:15 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +08:00
Leufolium efb929e7ac by Robin at 20241015 2024-10-15 15:11:14 +08:00
Leufolium 357ee2a3be 1 2024-10-14 13:39:19 +08:00
lwl0608 c72f0555a1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-12 16:34:07 +08:00
lwl0608 a1a414d6da fix 2024-10-12 16:33:58 +08:00
Leufolium 5295ffb251 Merge branch 'feat-IRONFANS-229-Robin' into conflict 2024-10-11 15:26:52 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +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
chenhao 3c9e3303d8 Merge pull request 'BUG-20241004-Robin' (#743) from BUG-20241004-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/743
 2024-10-04 17:10:35 +08:00
Leufolium e6794cf887 by Robin at 20241004; fix 2024-10-04 17:10:14 +08:00
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +08:00
lwl0608 80eabf0a5e Merge branch 'dev_PF' into test 2024-09-14 16:25:32 +08:00
lwl0608 dc5da5a647 add update pf 2024-09-14 16:25:14 +08:00
chenhao f202adbb5f Merge pull request 'by Robin at 20240912;' (#736) from feat-IRONFANS-212-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/736
 2024-09-12 16:19:11 +08:00