ilham
|
5af452ccec
|
fix: filter product in admin
|
2022-01-29 09:29:43 +07:00 |
|
ilham dwi pratama
|
9ce3338fb8
|
Merge branch 'main' into 'devops-production'
Main
See merge request empatnusabangsa/ppob/ppob-frontend!109
|
2022-01-29 02:24:38 +00:00 |
|
ilham dwi pratama
|
52025e1d65
|
Merge branch 'develop' into 'main'
Develop
See merge request empatnusabangsa/ppob/ppob-frontend!108
|
2022-01-29 02:23:57 +00:00 |
|
|
|
c2f766a9c1
|
Merge branch 'devops-staging' into 'devops-production'
Devops staging
See merge request empatnusabangsa/ppob/ppob-frontend!107
|
2022-01-28 10:20:24 +00:00 |
|
|
|
a2d4808be1
|
Merge branch 'develop' into 'devops-staging'
Update src/config/app.js, Dockerfile, .gitlab-ci.yml
See merge request empatnusabangsa/ppob/ppob-frontend!106
|
2022-01-28 10:18:47 +00:00 |
|
|
|
a715698e74
|
Update src/config/app.js, Dockerfile, .gitlab-ci.yml
|
2022-01-28 10:17:49 +00:00 |
|
|
|
3d46be7eda
|
Merge branch 'devops-staging' into 'devops-production'
Devops staging
See merge request empatnusabangsa/ppob/ppob-frontend!105
|
2022-01-28 09:34:50 +00:00 |
|
|
|
d0b4d52956
|
Merge branch 'develop' into 'devops-staging'
Develop
See merge request empatnusabangsa/ppob/ppob-frontend!104
|
2022-01-28 09:33:04 +00:00 |
|
|
|
b0512c2eb2
|
Update .gitlab-ci.yml
|
2022-01-28 09:31:07 +00:00 |
|
|
|
c1680822df
|
Pages Product
|
2022-01-28 16:26:43 +07:00 |
|
|
|
90e02e8d9f
|
Merge
|
2022-01-28 16:03:02 +07:00 |
|
ilham dwi pratama
|
3d2dba740d
|
Merge branch 'main' into 'devops-production'
Main
See merge request empatnusabangsa/ppob/ppob-frontend!102
|
2022-01-28 09:02:42 +00:00 |
|
|
|
240a8d8869
|
Merge
|
2022-01-28 16:00:20 +07:00 |
|
ilham
|
a4160ae2bd
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# src/component/BreadcumbComponent.js
# src/component/ProductComponent.js
# src/config/app.js
# src/index.css
# src/pages/App/App.js
# src/pages/App/DesktopLayout.js
# src/pages/App/MenuList.js
# src/pages/Home/Home.js
# src/pages/Login/Login.js
# src/pages/Membership/Membership.js
# src/pages/Membership/MembershipModal.js
# src/pages/Product/Product.js
# src/pages/Transaction/Pulsa.js
# src/pages/Transaction/Transaction.js
# src/store/authentication.js
# src/store/index.js
# src/store/membership.js
# src/store/product.js
# src/store/role.js
# src/store/ui.js
# src/store/user.js
# src/utils/http.js
|
2022-01-28 15:58:48 +07:00 |
|
|
|
f638ca70f7
|
Bug fixing
|
2022-01-28 15:18:09 +07:00 |
|
|
|
dbd77fae4e
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing Membership
See merge request empatnusabangsa/ppob/ppob-frontend!100
|
2022-01-28 06:57:56 +00:00 |
|
|
|
20879490cb
|
Bug Fixing Membership
|
2022-01-28 13:56:55 +07:00 |
|
|
|
f372e950bd
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!99
|
2022-01-28 04:46:33 +00:00 |
|
|
|
fd4090caaa
|
Bug Fixing
|
2022-01-28 11:45:38 +07:00 |
|
|
|
cd06e81009
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!98
|
2022-01-27 09:18:08 +00:00 |
|
|
|
aec06c9eb0
|
Bug Fixing
|
2022-01-27 16:16:01 +07:00 |
|
|
|
0b708f972c
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!97
|
2022-01-27 08:41:25 +00:00 |
|
|
|
0ee777cb8e
|
Bug Fixing
|
2022-01-27 15:40:20 +07:00 |
|
|
|
53b87a4203
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!96
|
2022-01-27 05:14:01 +00:00 |
|
|
|
859bf200ca
|
Bug Fixing
|
2022-01-27 12:12:27 +07:00 |
|
|
|
ab22658622
|
Merge branch 'develop' into 'devops-staging'
Develop
See merge request empatnusabangsa/ppob/ppob-frontend!95
|
2022-01-27 02:44:10 +00:00 |
|
|
|
8325c886bd
|
Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop
|
2022-01-27 09:41:19 +07:00 |
|
|
|
6239cfd491
|
Bug Fixing
|
2022-01-27 09:40:42 +07:00 |
|
|
|
d057864b3c
|
add deployment
|
2022-01-26 22:14:02 +07:00 |
|
|
|
855ac66a0a
|
Merge branch 'develop' into 'devops-staging'
add deployment
See merge request empatnusabangsa/ppob/ppob-frontend!94
|
2022-01-26 14:54:07 +00:00 |
|
|
|
ea18c3f16f
|
add deployment
|
2022-01-26 21:51:35 +07:00 |
|
|
|
2496d45043
|
Merge branch 'develop' into 'devops-staging'
Develop Fitur
See merge request empatnusabangsa/ppob/ppob-frontend!93
|
2022-01-26 12:39:50 +00:00 |
|
|
|
9fc1ee2fc4
|
Develop Fitur
|
2022-01-26 19:38:50 +07:00 |
|
|
|
9601218121
|
Merge branch 'develop' into 'devops-staging'
Perbaikan Page Konfirmasi
See merge request empatnusabangsa/ppob/ppob-frontend!92
|
2022-01-26 11:19:10 +00:00 |
|
|
|
e2205aa260
|
Perbaikan Page Konfirmasi
|
2022-01-26 18:18:12 +07:00 |
|
|
|
1d3f46cf20
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!91
|
2022-01-26 09:38:11 +00:00 |
|
|
|
fd950e270b
|
Bug Fixing
|
2022-01-26 16:37:04 +07:00 |
|
|
|
fe222f48bf
|
Merge branch 'develop' into 'devops-staging'
Tambah Fitur
See merge request empatnusabangsa/ppob/ppob-frontend!90
|
2022-01-26 09:11:54 +00:00 |
|
|
|
3c244bf9ba
|
Tambah Fitur
|
2022-01-26 16:10:46 +07:00 |
|
|
|
5014054b1c
|
Merge branch 'develop' into 'devops-staging'
Tambah Fitur
See merge request empatnusabangsa/ppob/ppob-frontend!87
|
2022-01-26 07:33:54 +00:00 |
|
|
|
9144a9ff56
|
Tambah Fitur
|
2022-01-26 12:22:16 +07:00 |
|
|
|
d76c5631cc
|
Merge branch 'develop' into 'devops-staging'
Develop
See merge request empatnusabangsa/ppob/ppob-frontend!86
|
2022-01-26 04:42:47 +00:00 |
|
|
|
d287798e5f
|
Tambah Fitur
|
2022-01-26 11:41:38 +07:00 |
|
|
|
198063a7d9
|
Bug Fixing
|
2022-01-25 09:59:57 +07:00 |
|
|
|
f6cc7ee359
|
Bug Fixing PPOB
|
2022-01-25 09:35:21 +07:00 |
|
|
|
a5e139838d
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!85
|
2022-01-24 11:39:13 +00:00 |
|
|
|
dcc2eb59df
|
Bug Fixing
|
2022-01-24 18:38:20 +07:00 |
|
|
|
f34660c487
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing PPOB
See merge request empatnusabangsa/ppob/ppob-frontend!84
|
2022-01-24 11:25:31 +00:00 |
|
|
|
c4737e8660
|
Bug Fixing PPOB
|
2022-01-24 18:24:25 +07:00 |
|
|
|
51cbce1a98
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing PPOB
See merge request empatnusabangsa/ppob/ppob-frontend!83
|
2022-01-24 11:01:18 +00:00 |
|
