|
|
32f33e6102
|
Bug Fixing
|
2022-02-03 16:39:05 +07:00 |
|
|
|
8364fad1ba
|
Merge branch 'develop' into 'devops-production'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!123
|
2022-02-03 08:40:35 +00:00 |
|
|
|
5bc668194d
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!122
|
2022-02-03 08:39:53 +00:00 |
|
|
|
c63c1b961d
|
Bug Fixing
|
2022-02-03 15:39:06 +07:00 |
|
|
|
be6f48fc8a
|
Merge branch 'develop' into 'devops-production'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!121
|
2022-02-03 07:54:24 +00:00 |
|
|
|
6c8286bff1
|
Merge branch 'develop' into 'devops-staging'
Bug Fixing
See merge request empatnusabangsa/ppob/ppob-frontend!120
|
2022-02-03 07:53:46 +00:00 |
|
|
|
c0fdb7c232
|
Bug Fixing
|
2022-02-03 14:52:56 +07:00 |
|
|
|
56b8008ee0
|
Merge branch 'develop' into 'devops-production'
Develop
See merge request empatnusabangsa/ppob/ppob-frontend!119
|
2022-02-03 07:02:37 +00:00 |
|
|
|
5c90f36e20
|
Merge branch 'develop' into 'devops-staging'
Hide Fitur
See merge request empatnusabangsa/ppob/ppob-frontend!118
|
2022-02-03 06:59:37 +00:00 |
|
|
|
b18e2dc619
|
Hide Fitur
|
2022-02-03 13:58:51 +07:00 |
|
|
|
5a1cca1825
|
Merge branch 'develop' into 'devops-staging'
Perbaikan Tampilan Mobile Menu Transaksi
See merge request empatnusabangsa/ppob/ppob-frontend!116
|
2022-02-03 06:29:38 +00:00 |
|
|
|
34629edc40
|
Perbaikan Tampilan Mobile Menu Transaksi
|
2022-02-03 13:28:50 +07:00 |
|
|
|
c5c1743fff
|
Merge branch 'develop' into 'devops-staging'
Tambah Role Customer Service
See merge request empatnusabangsa/ppob/ppob-frontend!115
|
2022-02-03 05:15:07 +00:00 |
|
|
|
238eeb92ce
|
Tambah Role Customer Service
|
2022-02-03 12:14:23 +07:00 |
|
ilham dwi pratama
|
a1b0e7500e
|
Merge branch 'develop' into 'devops-staging'
fix: detail user
See merge request empatnusabangsa/ppob/ppob-frontend!114
|
2022-02-02 20:23:34 +00:00 |
|
ilham
|
8d7d7369f4
|
fix: detail user
|
2022-02-03 03:22:41 +07:00 |
|
ilham dwi pratama
|
7da0ebfa57
|
Merge branch 'develop' into 'devops-staging'
Develop
See merge request empatnusabangsa/ppob/ppob-frontend!113
|
2022-02-02 20:15:44 +00:00 |
|
ilham
|
e8c4b9a2bf
|
fix some wording
|
2022-02-03 03:14:59 +07:00 |
|
|
|
e26fb13813
|
Bug fixing
|
2022-02-02 10:16:10 +07:00 |
|
ilham dwi pratama
|
78923fc727
|
Merge branch 'main' into 'devops-production'
Main
See merge request empatnusabangsa/ppob/ppob-frontend!112
|
2022-01-29 02:31:19 +00:00 |
|
ilham dwi pratama
|
b438973480
|
Merge branch 'develop' into 'devops-staging'
fix: filter product in admin
See merge request empatnusabangsa/ppob/ppob-frontend!111
|
2022-01-29 02:30:53 +00:00 |
|
ilham dwi pratama
|
ba472aa99f
|
Merge branch 'develop' into 'main'
fix: filter product in admin
See merge request empatnusabangsa/ppob/ppob-frontend!110
|
2022-01-29 02:30:18 +00:00 |
|
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 |
|
