wahyun
|
5e0e4ad0f6
|
update conflict
|
10 months ago |
|
wahyun
|
851e13f064
|
Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-backend into dev-wahyun
|
10 months ago |
|
wahyun
|
522fd9ba94
|
update compro endpoint
|
10 months ago |
 farhantock
|
94a3e9789f
|
Merge pull request 'Demo End Point' (#41) from Dev-Farhan into staging
Reviewed-on: ibnu/generic-ospro-backend#41
|
10 months ago |
|
farhantock
|
f7971fc07d
|
Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-backend into Dev-Farhan
|
10 months ago |
|
farhantock
|
b005fbbcae
|
send email register
|
10 months ago |
|
farhantock
|
1e1388f46d
|
update demo controller
|
10 months ago |
|
farhantock
|
3e5692847b
|
Demo End Point
|
10 months ago |
|
farhantock
|
220442a7fd
|
Merge pull request 'update response appConfig' (#40) from Dev-Farhan into staging
Reviewed-on: ibnu/generic-ospro-backend#40
|
10 months ago |
|
farhantock
|
0884009bdd
|
update response appConfig
|
10 months ago |
|
farhantock
|
02f2c896f8
|
Merge pull request 'staging' (#39) from staging into master
Reviewed-on: ibnu/generic-ospro-backend#39
|
10 months ago |
|
farhantock
|
d46ed84025
|
Merge pull request 'update filter datatables' (#38) from Dev-Farhan into staging
Reviewed-on: ibnu/generic-ospro-backend#38
|
10 months ago |
|
farhantock
|
7724402dfe
|
update filter datatables
|
10 months ago |
|
farhantock
|
7b4ddeb636
|
Merge pull request 'image & slider company' (#37) from dev-wahyun into staging
Reviewed-on: ibnu/generic-ospro-backend#37
|
10 months ago |
|
wahyun
|
1d09aa96d3
|
Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-backend into dev-wahyun
|
10 months ago |
|
wahyun
|
a747c1af1d
|
uplaoded image company
|
10 months ago |
|
farhantock
|
9bddaf8fbc
|
Merge pull request 'staging' (#36) from staging into master
Reviewed-on: ibnu/generic-ospro-backend#36
|
10 months ago |
|
farhantock
|
f4f5db5e55
|
Merge pull request 'update select field' (#35) from Dev-Farhan into staging
Reviewed-on: ibnu/generic-ospro-backend#35
|
10 months ago |
|
farhantock
|
8d2d5ac782
|
update select field
|
10 months ago |
|
farhantock
|
49451f12b2
|
Merge pull request 'Dev-Farhan' (#34) from Dev-Farhan into staging
Reviewed-on: ibnu/generic-ospro-backend#34
|
10 months ago |
|
farhantock
|
cca8ca6e04
|
Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-backend into Dev-Farhan
|
10 months ago |
|
farhantock
|
ce9cec79a9
|
Merge branch 'master' of https://git.oslog.id/ordo/adw-backend into Dev-Farhan
|
10 months ago |
|
farhantock
|
4cc57c18ec
|
update filter dashboard
|
10 months ago |
|
farhantock
|
ba661e006f
|
Merge pull request 'upload 2024-01-21' (#315) from staging into master
Reviewed-on: ordo/adw-backend#315
|
10 months ago |
|
farhantock
|
f4fe8dbbda
|
Merge pull request 'update report datatable' (#314) from dev-wahyu into staging
Reviewed-on: ordo/adw-backend#314
|
10 months ago |
wahyu
|
537c532b77
|
update report datatable
|
10 months ago |
 ibnu
|
711e9756eb
|
Merge pull request 'dev-wahyu' (#313) from dev-wahyu into staging
Reviewed-on: ordo/adw-backend#313
|
10 months ago |
|
farhantock
|
45da8fd80c
|
Merge pull request 'add company_id' (#33) from dev-wahyun into staging
Reviewed-on: ibnu/generic-ospro-backend#33
|
10 months ago |
|
wahyu
|
588305ebaf
|
update report datatable
|
10 months ago |
|
wahyun
|
ad7f148f37
|
Merge branch 'staging' of https://git.oslog.id/ibnu/generic-ospro-backend into dev-wahyun
|
10 months ago |
|
wahyun
|
3cac7e2363
|
adding company_id
|
10 months ago |
|
farhantock
|
08ad35fac1
|
Merge pull request 'Dev-Farhan' (#32) from Dev-Farhan into staging
Reviewed-on: ibnu/generic-ospro-backend#32
|
10 months ago |
|
farhantock
|
136fb42da4
|
add field company_id in models
|
10 months ago |
|
farhantock
|
e2e0676092
|
add new response appConfig
|
10 months ago |
|
farhantock
|
9e34feb918
|
Merge pull request 'upload 2024-01-12' (#312) from staging into master
Reviewed-on: ordo/adw-backend#312
|
10 months ago |
|
farhantock
|
3e30162eaf
|
Merge pull request 'Dev-Farhan' (#311) from Dev-Farhan into staging
Reviewed-on: ordo/adw-backend#311
|
10 months ago |
|
farhantock
|
caac6506f8
|
add sponsor
|
10 months ago |
|
farhantock
|
215142ec38
|
add childern
|
10 months ago |
|
farhantock
|
6e66ad594e
|
update filter project
|
10 months ago |
|
farhantock
|
c7b61065b8
|
Merge pull request 'user to activity update filter' (#310) from dev-wahyu into staging
Reviewed-on: ordo/adw-backend#310
|
11 months ago |
|
wahyun
|
c1443907b3
|
Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-backend into dev-wahyun
|
11 months ago |
|
wahyu
|
3cdae71bd7
|
user to activity update filter
|
11 months ago |
|
farhantock
|
bddc0b3773
|
Merge pull request 'staging' (#309) from staging into master
Reviewed-on: ordo/adw-backend#309
|
11 months ago |
|
farhantock
|
1ba1aa6028
|
Merge pull request 'Dev-Farhan' (#308) from Dev-Farhan into staging
Reviewed-on: ordo/adw-backend#308
|
11 months ago |
|
farhantock
|
5c825e5f8d
|
Merge branch 'staging' of https://git.oslog.id/ordo/adw-backend into Dev-Farhan
|
11 months ago |
|
farhantock
|
a69c983027
|
make new end point for project-cost
|
11 months ago |
|
farhantock
|
14d75efdc5
|
remove company_id ospro general
|
11 months ago |
|
farhantock
|
5f37f9f36e
|
Merge pull request 'upload 2023-12-27' (#307) from staging into master
Reviewed-on: ordo/adw-backend#307
|
11 months ago |
|
farhantock
|
95be6d8769
|
Merge pull request 'dev-wahyu' (#306) from dev-wahyu into staging
Reviewed-on: ordo/adw-backend#306
|
11 months ago |
|
farhantock
|
2e42d964b4
|
Merge pull request 'staging' (#31) from staging into master
Reviewed-on: ibnu/generic-ospro-backend#31
|
11 months ago |
