wangning
|
25d54b340b
|
Merge branch 'mailGunTest' into test
# Conflicts:
# src/main/resources/application-local.properties
# src/main/resources/application.properties
# src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
|
8 years ago |
|
wangning
|
6ab808a45f
|
update
|
8 years ago |
|
wangning
|
128eddeb28
|
update
|
8 years ago |
|
wangning
|
c2d64ca19a
|
qrcode
|
8 years ago |
|
wangning
|
58b12d66b3
|
modify mail gun properties
|
8 years ago |
|
wangning
|
7c0da6d5cf
|
update
|
8 years ago |
|
wangning
|
44087dd5d1
|
update
|
8 years ago |
|
wangning
|
2b2b5563d4
|
update
|
8 years ago |
|
wangning
|
f32e2205fb
|
update
|
8 years ago |
|
wangning
|
b34e6b8f3c
|
update
|
8 years ago |
|
wangning
|
9126519dcf
|
merge
|
8 years ago |
|
wangning
|
adbfe6ca31
|
Merge branch 'mailgun' of https://git.royalpay.com.au/git/royalv2.manage into mailgun
|
8 years ago |
yuan
|
cfa1f5f6e0
|
add~
|
8 years ago |
|
wangning
|
74b685beb8
|
update
|
8 years ago |
|
wangning
|
1363061693
|
update
|
8 years ago |
|
wangning
|
a46cfe5444
|
modify mail send
|
8 years ago |
|
wangning
|
7e21301e7d
|
update
|
8 years ago |
|
wangning
|
dcfa592ea1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into mailgun
|
8 years ago |
eason.qian
|
3d0310cf02
|
fix
|
8 years ago |
|
wangning
|
f9f58012e4
|
add mailgun interface
|
8 years ago |
|
eason.qian
|
99487530a3
|
fix
|
8 years ago |
|
wangning
|
9a1844fa13
|
update
|
8 years ago |
|
wangning
|
e5ef17bd7e
|
update
|
8 years ago |
|
wangning
|
8512a9d0a9
|
add mailgun notify
|
8 years ago |
|
wangning
|
f7f5a925dc
|
tmp
|
8 years ago |
|
wangning
|
dc1f20c838
|
add mail test
|
8 years ago |
|
wangning
|
ec0ead8d68
|
update
|
8 years ago |
|
wangning
|
1391d556b9
|
Merge branch 'develop'
|
8 years ago |
|
wangning
|
85b0f7d653
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
8 years ago |
|
wangning
|
1d666071ff
|
add bill page
|
8 years ago |
|
eason.qian
|
c6bdcde4a0
|
Merge branch 'develop'
|
8 years ago |
|
yuan
|
0ce6b156dd
|
fix html~~~
|
8 years ago |
|
eason.qian
|
a7bf155068
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/billqrcode/templates/bill_qrcode.html
|
8 years ago |
|
yuan
|
77621c6418
|
fix~
|
8 years ago |
|
eason.qian
|
420e644910
|
fix
|
8 years ago |
|
wangning
|
536ea593b0
|
Merge branch 'hotfix_2' into develop
|
8 years ago |
|
wangning
|
194b5d60a2
|
fix bug
|
8 years ago |
|
wangning
|
6fc0474464
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
wangning
|
e63f08ba19
|
fix bug
|
8 years ago |
|
wangning
|
9cf07ff142
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
wangning
|
a5f97c0fa0
|
roll back
|
8 years ago |
|
wangning
|
0bdb01445b
|
roll back
|
8 years ago |
|
wangning
|
42a103901a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
8 years ago |
|
wangning
|
14854979f8
|
close Estimate future interface
|
8 years ago |
|
wangning
|
ddee63590f
|
alsjd
|
8 years ago |
|
yuan
|
bce5a86aa4
|
fix bug~
|
8 years ago |
|
eason.qian
|
bb395fc38e
|
Merge branch 'develop'
|
8 years ago |
|
eason.qian
|
7f5dd867c3
|
fix
|
8 years ago |
|
eason.qian
|
e79066994a
|
Merge branch 'develop'
|
8 years ago |
|
yuan
|
c0fffb94e3
|
fix html
|
8 years ago |
