 chenhao
|
742e1318b7
|
Merge pull request 'by Robin at 20241022' (#768) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/768
|
2024-10-22 15:52:31 +08:00 |
|
Leufolium
|
c460f0974f
|
by Robin at 20241022
|
2024-10-22 15:52:06 +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
|
a5f6c2d931
|
by Robin at 20241021
|
2024-10-21 16:07:56 +08:00 |
|
Leufolium
|
b5979089b9
|
by Robin at 20241018
|
2024-10-18 16:41:06 +08:00 |
|
Leufolium
|
4fb589541b
|
1
|
2024-10-18 10:45:27 +08:00 |
|
Leufolium
|
9ebe86919d
|
by Robin at 20241017
|
2024-10-17 16:30:32 +08:00 |
|
Leufolium
|
9d9209be23
|
by Robin at 20241017; notif center logic
|
2024-10-17 15:51:27 +08:00 |
|
Leufolium
|
f30f710981
|
1
|
2024-10-17 10:35:39 +08:00 |
|
Leufolium
|
76574c4e18
|
Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231
|
2024-10-16 17:32:52 +08:00 |
|
Leufolium
|
d5afd82eb2
|
By Robin at 20241016
|
2024-10-16 17:25:37 +08:00 |
|
Leufolium
|
698a90904b
|
1
|
2024-10-16 15:32:17 +08:00 |
|
Leufolium
|
053045854d
|
by Robin at 20241016
|
2024-10-16 15:32:12 +08:00 |
|
Leufolium
|
ae74496934
|
1
|
2024-10-16 14:46:13 +08:00 |
 lwl0608
|
52811bbc7a
|
Merge branch 'dev-lwl/unlock_opt' into test
|
2024-10-10 09:17:12 +08:00 |
|
lwl0608
|
0ca8714f12
|
freeze opt
|
2024-10-10 09:17:07 +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 |
|
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 |