Commit Graph

737 Commits

Author SHA1 Message Date
ilham dwi pratama
c3ad69fe2b Merge branch 'develop' into 'devops-staging'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!131
2022-02-04 12:02:25 +00:00
ilham
454b1d86bb fix: membership 2022-02-04 19:01:39 +07:00
ilham
5f52ca9df4 fix: membership 2022-02-04 18:58:52 +07:00
19964c00bb Merge branch 'develop' into 'devops-production'
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!130
2022-02-03 12:42:02 +00:00
1eec1afbfd Merge branch 'develop' into 'devops-staging'
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!129
2022-02-03 12:41:28 +00:00
27a788ed14 Bug Fixing 2022-02-03 19:40:38 +07:00
b9d7d2b301 Merge branch 'develop' into 'devops-production'
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!128
2022-02-03 11:28:25 +00:00
778ba4cdec Merge branch 'develop' into 'devops-staging'
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!127
2022-02-03 11:27:41 +00:00
1346d625f8 Bug Fixing 2022-02-03 18:26:58 +07:00
eb5c474a0c Merge branch 'develop' into 'devops-production'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!126
2022-02-03 09:58:26 +00:00
5a03e7c11c Merge branch 'develop' into 'devops-staging'
Fixing Tampilan Mobile Menu Detail User

See merge request empatnusabangsa/ppob/ppob-frontend!125
2022-02-03 09:57:44 +00:00
4ea7e8d632 Fixing Tampilan Mobile Menu Detail User 2022-02-03 16:56:58 +07:00
0ad6510f79 Merge branch 'develop' into 'devops-staging'
Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!124
2022-02-03 09:41:24 +00:00
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