ilham dwi pratama
							
						 
					 | 
					
						
						
							
						
						3577bb5bd7
					 | 
					
						
						
							
							Merge branch 'devops-staging' into 'develop'
						
						
						
						
						
						
						
						# Conflicts:
#   src/config/app.js 
						
						
					 | 
					
						2021-12-28 10:19:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c7d3012bb1
					 | 
					
						
						
							
							Perbaikan Project PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-28 16:21:45 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						beb3cdf6d1
					 | 
					
						
						
							
							Perbaikan Project PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-28 15:58:29 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ad15665cc
					 | 
					
						
						
							
							Perbaikan Project PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-28 13:46:52 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf0e28c4f3
					 | 
					
						
						
							
							Perbaikan Projek PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-27 18:58:51 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d0c37ec9b
					 | 
					
						
						
							
							Perbaikan Project PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-27 18:52:54 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d590b94a6c
					 | 
					
						
						
							
							Perbaikan Project PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-27 17:50:24 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a2bde5ba8
					 | 
					
						
						
							
							Perbaikan Project PPOB
						
						
						
						
						
						
					 | 
					
						2021-12-27 15:55:34 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f2e3ff3fa
					 | 
					
						
						
							
							Update app.js
						
						
						
						
						
						
					 | 
					
						2021-12-27 05:29:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c7e2724db
					 | 
					
						
						
							
							Update app.js
						
						
						
						
						
						
					 | 
					
						2021-12-27 05:28:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83e68567aa
					 | 
					
						
						
							
							Update app.js
						
						
						
						
						
						
					 | 
					
						2021-12-27 05:28:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham dwi pratama
							
						 
					 | 
					
						
						
							
						
						e702d604ac
					 | 
					
						
						
							
							Merge branch 'develop' into 'devops-staging'
						
						
						
						
						
						
						
						Develop
See merge request empatnusabangsa/ppob/ppob-frontend!20 
						
						
					 | 
					
						2021-12-26 16:03:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						668c64f193
					 | 
					
						
						
							
							fix: add code in partner
						
						
						
						
						
						
					 | 
					
						2021-12-26 11:19:57 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69fc55338d
					 | 
					
						
						
							
							Fixing Menu
						
						
						
						
						
						
					 | 
					
						2021-12-24 14:50:46 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						65c9c0b39d
					 | 
					
						
						
							
							Fixed Menu
						
						
						
						
						
						
					 | 
					
						2021-12-24 13:23:00 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3204ba4b38
					 | 
					
						
						
							
							Menu Fixing
						
						
						
						
						
						
					 | 
					
						2021-12-24 12:58:41 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c715069d63
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop
						
						
						
						
						
						
					 | 
					
						2021-12-24 10:49:42 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c371a727b1
					 | 
					
						
						
							
							Repair Menu
						
						
						
						
						
						
					 | 
					
						2021-12-24 10:48:06 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Catur Bagaskara
							
						 
					 | 
					
						
						
							
						
						9af3441558
					 | 
					
						
						
							
							Merge branch 'develop' into 'devops-staging'
						
						
						
						
						
						
						
						Develop
See merge request empatnusabangsa/ppob/ppob-frontend!19 
						
						
					 | 
					
						2021-12-23 18:45:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						fbad2d68e8
					 | 
					
						
						
							
							feat: add phone number on buy product
						
						
						
						
						
						
					 | 
					
						2021-12-24 01:44:55 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						5ac16feb6b
					 | 
					
						
						
							
							fix: format date on profile
						
						
						
						
						
						
					 | 
					
						2021-12-24 01:29:59 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Catur Bagaskara
							
						 
					 | 
					
						
						
							
						
						30cb348e10
					 | 
					
						
						
							
							Merge branch 'develop' into 'devops-staging'
						
						
						
						
						
						
						
						Develop
See merge request empatnusabangsa/ppob/ppob-frontend!18 
						
						
					 | 
					
						2021-12-23 17:58:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						c68d8105e3
					 | 
					
						
						
							
							feat: remove extra whitespace
						
						
						
						
						
						
					 | 
					
						2021-12-24 00:57:42 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						7c38f65ba9
					 | 
					
						
						
							
							feat: ajust detail user
						
						
						
						
						
						
					 | 
					
						2021-12-24 00:54:29 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						258dd4af34
					 | 
					
						
						
							
							feat: link detail url
						
						
						
						
						
						
					 | 
					
						2021-12-23 23:21:12 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Catur Bagaskara
							
						 
					 | 
					
						
						
							
						
						e595dfdab0
					 | 
					
						
						
							
							Merge branch 'develop' into 'devops-staging'
						
						
						
						
						
						
						
						Develop
See merge request empatnusabangsa/ppob/ppob-frontend!17 
						
						
					 | 
					
						2021-12-23 16:17:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						98e7827247
					 | 
					
						
						
							
							feat: add separated column in date and add pagination on price history on product detail
						
						
						
						
						
						
					 | 
					
						2021-12-23 23:16:47 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						097782d791
					 | 
					
						
						
							
							fix: role button new product admin
						
						
						
						
						
						
					 | 
					
						2021-12-23 21:51:37 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						52a75ff081
					 | 
					
						
						
							
							feat: move upload into modal
						
						
						
						
						
						
					 | 
					
						2021-12-23 21:31:37 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						884a23ae80
					 | 
					
						
						
							
							Repair Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 19:32:29 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5229359425
					 | 
					
						
						
							
							Repair Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 19:18:27 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71e6f00fcd
					 | 
					
						
						
							
							Repair Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 17:46:22 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2349912c73
					 | 
					
						
						
							
							Repair Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 17:06:49 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						195e0e80e4
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop
						
						
						
						
						
						
					 | 
					
						2021-12-23 17:05:44 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd2696efca
					 | 
					
						
						
							
							Reparing Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 17:05:03 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						4d40a6f475
					 | 
					
						
						
							
							feat: force reload if logout
						
						
						
						
						
						
					 | 
					
						2021-12-23 16:50:34 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						3be7561c3c
					 | 
					
						
						
							
							chore: handler errors upload excel product
						
						
						
						
						
						
					 | 
					
						2021-12-23 16:48:52 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						78d00da35d
					 | 
					
						
						
							
							chore: remove ununsed code to update user
						
						
						
						
						
						
					 | 
					
						2021-12-23 16:35:56 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						1a0a1756b0
					 | 
					
						
						
							
							chore: move action button into detail user
						
						
						
						
						
						
					 | 
					
						2021-12-23 16:30:14 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db6287ca2c
					 | 
					
						
						
							
							Reparing Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 16:22:23 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e2480dc63
					 | 
					
						
						
							
							Repair Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 16:03:57 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d221a3987d
					 | 
					
						
						
							
							Repairing Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 15:38:15 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c95aa84026
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop
						
						
						
						
						
						
					 | 
					
						2021-12-23 15:11:35 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ead48ad2a
					 | 
					
						
						
							
							Config Page
						
						
						
						
						
						
					 | 
					
						2021-12-23 15:06:46 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						91ecdfb541
					 | 
					
						
						
							
							chore: rewrite function for upload images in payback
						
						
						
						
						
						
					 | 
					
						2021-12-23 13:51:05 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						d591615e66
					 | 
					
						
						
							
							feat: add upload excel product functions
						
						
						
						
						
						
					 | 
					
						2021-12-23 13:50:26 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						edc6d3e317
					 | 
					
						
						
							
							fix: wording bahasa
						
						
						
						
						
						
					 | 
					
						2021-12-23 12:18:39 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caturbgs
							
						 
					 | 
					
						
						
							
						
						a16f42145b
					 | 
					
						
						
							
							fix: detail product
						
						
						
						
						
						
					 | 
					
						2021-12-23 12:07:29 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4ba8f07f93
					 | 
					
						
						
							
							Config Page
						
						
						
						
						
						
					 | 
					
						2021-12-23 12:05:30 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce2d2e1072
					 | 
					
						
						
							
							Config Menu
						
						
						
						
						
						
					 | 
					
						2021-12-23 11:53:07 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |