| 
						
					 | 
					
						
						
							
						
						613d0eac0e
					 | 
					
						
						
							
							Merge branch 'front-fixes' into 'master'
						
						
						
						
						
						
						
						responsive tables label fix
See merge request mohit.panjvani/crater-web!40 
						
						
					 | 
					
						2019-11-17 06:08:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fab1dea6c1
					 | 
					
						
						
							
							Merge branch 'update-app-translation' into 'master'
						
						
						
						
						
						
						
						translation changes in update app
See merge request mohit.panjvani/crater-web!42 
						
						
					 | 
					
						2019-11-17 06:07:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						858ef44919
					 | 
					
						
						
							
							Merge branch 'logo-upload' into 'master'
						
						
						
						
						
						
						
						fix cropper Logo upload
See merge request mohit.panjvani/crater-web!43 
						
						
					 | 
					
						2019-11-17 06:06:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d12f3162e
					 | 
					
						
						
							
							refactor styles
						
						
						
						
						
						
					 | 
					
						2019-11-16 19:39:08 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eebec45ce1
					 | 
					
						
						
							
							fix button color and some route change
						
						
						
						
						
						
					 | 
					
						2019-11-16 18:34:28 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b01eb65d5e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into front-fixes
						
						
						
						
						
						
					 | 
					
						2019-11-16 18:16:53 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e0ff3f6cf
					 | 
					
						
						
							
							refactor component
						
						
						
						
						
						
					 | 
					
						2019-11-16 17:53:20 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8de610ad63
					 | 
					
						
						
							
							fix logo upload
						
						
						
						
						
						
					 | 
					
						2019-11-16 17:50:21 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8aef621692
					 | 
					
						
						
							
							merge dev
						
						
						
						
						
						
					 | 
					
						2019-11-16 16:33:19 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb2fc18d55
					 | 
					
						
						
							
							update default wizard step to first
						
						
						
						
						
						
					 | 
					
						2019-11-16 14:11:24 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09c03af9f8
					 | 
					
						
						
							
							remove unwatnted code
						
						
						
						
						
						
					 | 
					
						2019-11-16 14:10:27 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6286ccca2e
					 | 
					
						
						
							
							translation changes in update app
						
						
						
						
						
						
					 | 
					
						2019-11-16 14:07:15 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e13518524
					 | 
					
						
						
							
							fix estimate status in view page
						
						
						
						
						
						
					 | 
					
						2019-11-16 13:52:46 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6df6cf498b
					 | 
					
						
						
							
							fix update-app
						
						
						
						
						
						
					 | 
					
						2019-11-16 13:42:26 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b4b9daecc
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web
						
						
						
						
						
						
					 | 
					
						2019-11-16 13:37:22 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a0c6932ca
					 | 
					
						
						
							
							fix update-app screen spacing and alerts
						
						
						
						
						
						
					 | 
					
						2019-11-16 13:27:37 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa9197c5bc
					 | 
					
						
						
							
							fix cropper logo
						
						
						
						
						
						
					 | 
					
						2019-11-16 13:25:30 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4cd15c71d7
					 | 
					
						
						
							
							responsive tables label fix
						
						
						
						
						
						
					 | 
					
						2019-11-16 12:36:58 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						748a252fa8
					 | 
					
						
						
							
							solve conflict
						
						
						
						
						
						
					 | 
					
						2019-11-16 11:40:50 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5d70832f20
					 | 
					
						
						
							
							remove unused files and refactor variable names and function names
						
						
						
						
						
						
					 | 
					
						2019-11-15 21:02:53 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0dafc47f52
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2019-11-15 20:56:24 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2b6130150
					 | 
					
						
						
							
							refactor reponsive invoice and estimate
						
						
						
						
						
						
						
						crater styles 
						
						
					 | 
					
						2019-11-15 20:55:25 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						173e919a1a
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2019-11-15 20:03:20 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69fbf73d6d
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status
						
						
						
						
						
						
					 | 
					
						2019-11-15 19:44:48 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d529c1d68f
					 | 
					
						
						
							
							fix status action  in view estimate
						
						
						
						
						
						
					 | 
					
						2019-11-15 19:43:42 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1567d9fd37
					 | 
					
						
						
							
							refactor base modal styles
						
						
						
						
						
						
					 | 
					
						2019-11-15 19:42:16 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						19947e6008
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling
						
						
						
						
						
						
					 | 
					
						2019-11-15 19:06:00 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a08171f47f
					 | 
					
						
						
							
							validation changes
						
						
						
						
						
						
					 | 
					
						2019-11-15 19:04:22 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e018d71443
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status
						
						
						
						
						
						
					 | 
					
						2019-11-15 18:56:57 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						563ae2c3f9
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2019-11-15 18:48:00 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						35c5757c34
					 | 
					
						
						
							
							Merge branch 'pdf-templates' into 'master'
						
						
						
						
						
						
						
						fix invoice and estimate page-break margin
See merge request mohit.panjvani/crater-web!30 
						
						
					 | 
					
						2019-11-15 12:42:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c3f69a3f60
					 | 
					
						
						
							
							fix invoice and estimate page-break margin
						
						
						
						
						
						
					 | 
					
						2019-11-15 18:00:42 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8948af0b1
					 | 
					
						
						
							
							front end changes
						
						
						
						
						
						
					 | 
					
						2019-11-15 17:42:03 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a5fa5458ec
					 | 
					
						
						
							
							Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update
						
						
						
						
						
						
					 | 
					
						2019-11-15 17:41:11 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf1d39d111
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into item-modal-styling
						
						
						
						
						
						
					 | 
					
						2019-11-15 16:43:41 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17abcdb67b
					 | 
					
						
						
							
							made changes
						
						
						
						
						
						
					 | 
					
						2019-11-15 16:43:34 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03da6eec2a
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status
						
						
						
						
						
						
					 | 
					
						2019-11-15 13:05:20 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						adbc04846c
					 | 
					
						
						
							
							fix invoice getter
						
						
						
						
						
						
					 | 
					
						2019-11-15 12:55:35 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a76286c402
					 | 
					
						
						
							
							made some changes and removed changes of vue-multi-select
						
						
						
						
						
						
					 | 
					
						2019-11-15 11:31:33 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ff47c4286
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into modal-size
						
						
						
						
						
						
					 | 
					
						2019-11-15 09:49:32 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34d78df68a
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2019-11-14 20:55:59 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba54b85709
					 | 
					
						
						
							
							refactor template
						
						
						
						
						
						
					 | 
					
						2019-11-14 20:54:53 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						75b0cd4a5e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status-action
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:57:14 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						090c33f63c
					 | 
					
						
						
							
							fix status action  in view invoice
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:54:23 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21cc2d7674
					 | 
					
						
						
							
							fix conflict
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:46:55 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0fa5be9124
					 | 
					
						
						
							
							merge with master
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:42:23 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0debf9b393
					 | 
					
						
						
							
							fix date display  and other small issues
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:41:33 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b3a9291d44
					 | 
					
						
						
							
							update front changes
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:40:56 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						929ae6bdc7
					 | 
					
						
						
							
							mark-as-sent in vue action
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:02:34 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2546d96b5
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web
						
						
						
						
						
						
					 | 
					
						2019-11-14 18:11:06 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |