lwl0608
|
0f596d420d
|
Merge branch 'dev-lwl/fix' into test
|
2024-05-04 22:16:05 +08:00 |
lwl0608
|
50c259249e
|
fix is_moment_image_encrypt_enabled
|
2024-05-04 22:15:57 +08:00 |
Leufolium
|
c82974fadf
|
Merge remote-tracking branch 'origin/main' into conf
|
2024-05-01 03:27:04 +08:00 |
Leufolium
|
aca9281087
|
by Robin at 20240501; fix upload fail video mod
|
2024-05-01 01:54:47 +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 |
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 |
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 |
Leufolium
|
f6c60cf574
|
by Robin at 20240429
|
2024-04-29 14:17:29 +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
|
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 |
Leufolium
|
e8649e1111
|
BY ROBIN AT 20240428
|
2024-04-28 21:16:18 +08:00 |
chenhao
|
0c86d4db01
|
Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
|
2024-04-27 11:17:19 +08:00 |
Leufolium
|
edb5caf001
|
by Robin at 20240427
|
2024-04-27 11:14:44 +08:00 |
Leufolium
|
ddbba1f860
|
by Robin at 20240427
|
2024-04-27 00:18:31 +08:00 |
Leufolium
|
0630bd9a18
|
by Robin at 20240426
|
2024-04-26 10:46:37 +08:00 |
lwl0608
|
8b9bc15d2f
|
测试环境不加token
|
2024-04-22 21:11:08 +08:00 |
chenhao
|
6524a34a85
|
Merge pull request 'feat-IRONFANS-70' (#276) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/276
|
2024-04-11 21:52:48 +08:00 |
Leufolium
|
b4e04b8841
|
by Robin at 20240411
|
2024-04-11 21:51:46 +08:00 |
Leufolium
|
e985e15ae1
|
Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conf
|
2024-04-08 20:14:44 +08:00 |
Leufolium
|
8927d22bba
|
by Robin at 20240408
|
2024-04-08 20:05:13 +08:00 |
Leufolium
|
5a333382ff
|
Merge remote-tracking branch 'origin/feat-IRONFANS-70' into cf
|
2024-04-05 17:11:18 +08:00 |
Leufolium
|
4820bd9503
|
by Robin at 20240404
|
2024-04-04 20:48:42 +08:00 |
Leufolium
|
be27160261
|
Merge remote-tracking branch 'origin/feat-IRONFANS-70' into conflict
|
2024-04-03 16:55:08 +08:00 |
Leufolium
|
50f7e16608
|
by Robin at 20240403
|
2024-04-03 04:56:21 +08:00 |
Leufolium
|
a31e57c806
|
by Robin at 20240402
|
2024-04-02 18:53:26 +08:00 |
Leufolium
|
a69bcdb6a2
|
Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin
|
2024-04-01 11:19:10 +08:00 |
Leufolium
|
113cf31495
|
Merge remote-tracking branch 'origin/main' into test
|
2024-03-28 12:12:05 +08:00 |
Leufolium
|
d96a03b02c
|
by Robin at 20240326; fix high concurrency problem
|
2024-03-26 18:26:47 +08:00 |
Leufolium
|
7b2d360274
|
by Robin at 20240325; nil
|
2024-03-25 19:37:01 +08:00 |
Leufolium
|
1ab2b556a1
|
Merge branch 'BUG-20240322-0001-Robin' into mainconflict
|
2024-03-25 12:13:49 +08:00 |
Leufolium
|
294bea59e4
|
By Robin at 20240325; fix bug
|
2024-03-25 12:11:29 +08:00 |
lwl0608
|
7bb527c1dc
|
fix panic
|
2024-03-25 11:25:37 +08:00 |
Leufolium
|
5344a54888
|
Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict
|
2024-03-22 13:54:11 +08:00 |
Leufolium
|
407292fe8d
|
by Robin at 20240321
|
2024-03-21 23:26:23 +08:00 |
lwl0608
|
53086cde6c
|
fix recover
|
2024-03-21 20:27:42 +08:00 |
lwl0608
|
f5cc4e4891
|
fix recovery
|
2024-03-21 20:22:10 +08:00 |
lwl0608
|
ad95c1be67
|
recover
|
2024-03-21 20:18:22 +08:00 |
lwl0608
|
1255e0f916
|
fix 退款理由
|
2024-03-21 19:54:20 +08:00 |
Leufolium
|
37c3929e9d
|
Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict
|
2024-03-19 00:01:43 +08:00 |
Leufolium
|
67e27e04db
|
Merge branch 'BUG-20240316-0001-Robin' into conflict
|
2024-03-16 22:36:05 +08:00 |
Leufolium
|
1954e80ab3
|
Merge branch 'feat-IRONFANS-58-Robin' into conflict
|
2024-03-14 07:55:43 +08:00 |
Leufolium
|
a2f70a63d9
|
by Robin at 20240314; add newly-created moment
|
2024-03-14 07:53:25 +08:00 |
lwl0608
|
371cf04c5f
|
ch log
|
2024-03-13 20:51:29 +08:00 |
lwl0608
|
779e47996e
|
Merge branch 'dev-lwl/refund'
|
2024-03-13 20:35:32 +08:00 |
lwl0608
|
b833ecdc9e
|
refund
|
2024-03-13 20:35:18 +08:00 |
lwl0608
|
f781786e13
|
fix cdn
|
2024-03-12 21:21:46 +08:00 |
Leufolium
|
f990dd0be0
|
Merge branch 'feat-IRONFANS-66-Robin' into conflict
|
2024-03-12 12:10:16 +08:00 |
lwl0608
|
19f60097ff
|
cdn test
|
2024-03-08 15:49:57 +08:00 |