 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
|
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 |
|
lwl0608
|
cb3ea25b3c
|
Merge branch 'dev_search_zmember' into test
|
2024-09-10 12:34:57 +08:00 |
|
lwl0608
|
9c5d145128
|
fix
|
2024-09-10 12:34:53 +08:00 |
|
lwl0608
|
18ed0b8d14
|
Merge branch 'dev_search_zmember' into test
|
2024-09-09 17:28:18 +08:00 |
|
lwl0608
|
ff2c8b4131
|
x
|
2024-09-09 17:28:12 +08:00 |
|
lwl0608
|
7ae2dc5955
|
merge
|
2024-09-04 19:06:53 +08:00 |
|
lwl0608
|
afa4ef12db
|
total
|
2024-09-04 19:05:49 +08:00 |
|
lwl0608
|
eedc49b4b2
|
main
|
2024-09-04 15:23:51 +08:00 |
|
chenhao
|
d7d7501919
|
Merge pull request 'feat-IRONFANS-198-Robin' (#718) from feat-IRONFANS-198-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/718
|
2024-09-02 18:37:03 +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 |
|
lwl0608
|
b72ea86f5b
|
merge
|
2024-08-27 17:06:03 +08:00 |
|
lwl0608
|
d5f00f015d
|
rollback z refund
|
2024-08-27 16:57:50 +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
|
50974050a3
|
Merge pull request 'by Robin at 20240822' (#702) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/702
|
2024-08-22 12:19:39 +08:00 |
|
Leufolium
|
75413625fd
|
by Robin at 20240822
|
2024-08-22 12:19:01 +08:00 |
|
chenhao
|
c5f8b07beb
|
Merge pull request 'by Robin at 20240821' (#701) from feat-IRONFANS-198-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/701
|
2024-08-21 22:20:42 +08:00 |
|
Leufolium
|
18e50bbd86
|
by Robin at 20240821
|
2024-08-21 22:19:56 +08:00 |
|
lwl0608
|
7485a02f11
|
Merge branch 'dev_search_zmember' into test
|
2024-08-21 10:40:43 +08:00 |
|
lwl0608
|
b78a44d341
|
add apis
|
2024-08-21 10:40:36 +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
|
5abd6883d4
|
by Robin at 20240816
|
2024-08-16 07:06:12 +08:00 |
|
Leufolium
|
d4cff8cc01
|
by Robin at 20240816
|
2024-08-16 06:14:55 +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 |
|
Leufolium
|
98f605c265
|
Merge branch 'feat-IRONFANS-176-Robin' into mainconf
|
2024-08-01 22:34:08 +08:00 |
|
Leufolium
|
2793aff71d
|
Merge remote-tracking branch 'origin/feat-IRONFANS-173-Robin' into mainconflict
|
2024-07-31 22:14:57 +08:00 |
|
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 |
|
Leufolium
|
2e08c98384
|
1
|
2024-07-30 12:08:21 +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 |
|
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 |