tuannt20
|
c1fe44959f
|
fix conflict
|
2022-11-22 10:31:31 +07:00 |
 Minh Nguyen
|
5a2a7fbbe0
|
Merge pull request 'add nats staff' (#71) from feature/add-source-response-update-quantity into feature/campaign
Reviewed-on: #71
|
2022-11-22 03:26:24 +00:00 |
|
tuannt20
|
0dd3dce224
|
add nats staff
|
2022-11-22 10:04:40 +07:00 |
phuanbui
|
913c762897
|
Merge pull request 'add get segment info' (#70) from feaure/staff-getinfo into develop
Reviewed-on: #70
|
2022-11-21 22:44:59 +00:00 |
anbuiselly
|
2719017b61
|
add cmt
|
2022-11-22 05:44:36 +07:00 |
|
anbuiselly
|
0a1c76bb88
|
add get segment info
|
2022-11-22 05:43:02 +07:00 |
thaingocquang
|
4d19b6d7cf
|
Merge branch 'refactor-location' into develop
|
2022-11-21 16:20:33 +07:00 |
|
thaingocquang
|
e3599d1903
|
[location] update location subject
|
2022-11-21 16:20:06 +07:00 |
|
thaingocquang
|
75c8aefb9e
|
Merge branch 'refactor-location' into develop
|
2022-11-21 16:00:31 +07:00 |
|
thaingocquang
|
8b907cec0d
|
new location subject
|
2022-11-21 15:59:56 +07:00 |
|
phuanbui
|
48460713cb
|
Merge pull request 'change request get staff' (#69) from feaure/staff-getinfo into develop
Reviewed-on: #69
|
2022-11-21 03:39:07 +00:00 |
|
anbuiselly
|
f8658523a2
|
change request get staff
|
2022-11-21 10:37:53 +07:00 |
|
phuanbui
|
691e9d76fa
|
Merge pull request 'fix' (#68) from feaure/staff-getinfo into develop
Reviewed-on: #68
|
2022-11-21 01:55:47 +00:00 |
|
anbuiselly
|
74b88b9a2f
|
fix
|
2022-11-21 08:55:30 +07:00 |
|
phuanbui
|
ab51f5fd09
|
Merge pull request 'change mgs get staff-info' (#67) from feaure/staff-getinfo into develop
Reviewed-on: #67
|
2022-11-21 01:34:47 +00:00 |
|
anbuiselly
|
f9c269ce2d
|
change mgs get staff-info
|
2022-11-21 08:33:39 +07:00 |
|
thaingocquang
|
56cdb74646
|
Merge branch 'refactor-location' into develop
|
2022-11-21 00:29:44 +07:00 |
|
thaingocquang
|
1a77ac3d8e
|
[location] update location resp model
|
2022-11-21 00:29:18 +07:00 |
|
thaingocquang
|
5eb76d813c
|
Merge branch 'refactor-location' into develop
|
2022-11-21 00:09:03 +07:00 |
|
thaingocquang
|
be18b81589
|
[location] update location resp model
|
2022-11-21 00:08:21 +07:00 |
|
phuanbui
|
45b49fb83c
|
Merge pull request 'fix get list staff' (#66) from feaure/staff-getinfo into develop
Reviewed-on: #66
|
2022-11-18 14:50:21 +00:00 |
|
anbuiselly
|
2199bb4eef
|
fix get list staff
|
2022-11-18 21:49:42 +07:00 |
|
phuanbui
|
6cd6c3e231
|
Merge pull request 'edit get staff-info' (#65) from feaure/staff-getinfo into develop
Reviewed-on: #65
|
2022-11-18 10:48:46 +00:00 |
|
anbuiselly
|
0a9381065f
|
edit get staff-info
|
2022-11-18 17:47:26 +07:00 |
|
phuanbui
|
d891c3a051
|
Merge pull request 'get staff by notification action' (#64) from feaure/staff-getinfo into develop
Reviewed-on: #64
|
2022-11-18 09:23:35 +00:00 |
|
anbuiselly
|
8cceae74ef
|
get staff by notification action
|
2022-11-18 16:22:17 +07:00 |
|
Minh Nguyen
|
15ba847ef8
|
Merge pull request 'update notification opts' (#63) from feature/campaign into develop
Reviewed-on: #63
|
2022-11-18 07:52:29 +00:00 |
Nguyen Minh
|
549aee36d0
|
update notification opts
|
2022-11-18 14:52:05 +07:00 |
Sinh
|
17dace7edf
|
remove err method email
|
2022-11-18 10:24:06 +07:00 |
|
Sinh
|
23df6da6bf
|
Merge branch 'admin-push-notification-supplier' into develop
|
2022-11-18 10:14:21 +07:00 |
|
Sinh
|
d45da3e74c
|
nats - get supplier from old server
|
2022-11-18 10:13:41 +07:00 |
|
thaingocquang
|
89d10dbb7f
|
Merge branch 'refactor-location' into develop
|
2022-11-17 17:19:24 +07:00 |
|
thaingocquang
|
b9885a2a02
|
[location] RequestCondition oldSlugs
|
2022-11-17 17:19:04 +07:00 |
|
thaingocquang
|
35e98d866f
|
Merge branch 'refactor-location' into develop
|
2022-11-17 16:50:03 +07:00 |
|
thaingocquang
|
f602e17ef2
|
[location] add oldSlug to RequestCondition
|
2022-11-17 16:49:02 +07:00 |
Tue
|
d293fb7412
|
Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
|
2022-11-17 13:56:08 +07:00 |
|
Tue
|
035fb59f64
|
build email
|
2022-11-17 13:55:44 +07:00 |
|
Minh Nguyen
|
d10f445bf2
|
Merge pull request 'feature/campaign' (#62) from feature/campaign into develop
Reviewed-on: #62
|
2022-11-17 02:33:10 +00:00 |
|
Minh Nguyen
|
828d4e34ba
|
Merge pull request 'rename' (#61) from feature/get-detail-social-post into feature/campaign
Reviewed-on: #61
|
2022-11-17 02:32:48 +00:00 |
|
tuannt20
|
b8f10912c1
|
rename
|
2022-11-17 09:27:45 +07:00 |
|
Minh Nguyen
|
b3722384f8
|
Merge pull request 'feature/campaign' (#60) from feature/campaign into develop
Reviewed-on: #60
|
2022-11-16 10:35:35 +00:00 |
|
Minh Nguyen
|
cf9f8f2c63
|
Merge pull request 'fix' (#59) from feature/get-detail-social-post into feature/campaign
Reviewed-on: #59
|
2022-11-16 10:34:53 +00:00 |
|
tuannt20
|
26f8b64258
|
fix
|
2022-11-16 17:33:29 +07:00 |
|
Minh Nguyen
|
d04712a560
|
Merge pull request 'feature/campaign' (#58) from feature/campaign into develop
Reviewed-on: #58
|
2022-11-16 10:23:51 +00:00 |
|
Minh Nguyen
|
cfa306d0fc
|
Merge pull request 'nats model campaign admin' (#57) from feature/get-detail-social-post into feature/campaign
Reviewed-on: #57
|
2022-11-16 10:23:33 +00:00 |
|
tuannt20
|
6e21f72ac0
|
fix name func
|
2022-11-16 17:21:37 +07:00 |
|
tuannt20
|
7a213f4b4d
|
nats model campaign admin
|
2022-11-16 16:43:17 +07:00 |
|
Nguyen Minh
|
44e7cca0d7
|
Merge branch 'feature/campaign' into develop
|
2022-11-14 15:11:18 +07:00 |
|
Nguyen Minh
|
18f4444156
|
fix
|
2022-11-14 15:11:04 +07:00 |
|
Nguyen Minh
|
3e1dcb2fe1
|
fix conflict
|
2022-11-14 14:47:20 +07:00 |