| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a76286c402
					 | 
					
						
						
							
							made some changes and removed changes of vue-multi-select
						
						
						
						
						
						
					 | 
					
						2019-11-15 11:31:33 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b3a9291d44
					 | 
					
						
						
							
							update front changes
						
						
						
						
						
						
					 | 
					
						2019-11-14 19:40:56 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0eb4d91086
					 | 
					
						
						
							
							add validation on installation wizard
						
						
						
						
						
						
					 | 
					
						2019-11-14 17:02:56 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e04a8d0a5
					 | 
					
						
						
							
							add media query in modals and pc in item units
						
						
						
						
						
						
					 | 
					
						2019-11-14 16:28:09 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9cce0b10a2
					 | 
					
						
						
							
							Merge branch 'translation-warning-french' into 'master'
						
						
						
						
						
						
						
						fix translation issues in french and fix issues in estimate action
See merge request mohit.panjvani/crater-web!18 
						
						
					 | 
					
						2019-11-14 06:33:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b3823982d
					 | 
					
						
						
							
							Merge branch 'password-length' into 'master'
						
						
						
						
						
						
						
						fix the password length
See merge request mohit.panjvani/crater-web!17 
						
						
					 | 
					
						2019-11-14 06:22:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						441b6bb370
					 | 
					
						
						
							
							add update app on settings
						
						
						
						
						
						
					 | 
					
						2019-11-13 21:08:15 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						35a12fd4d1
					 | 
					
						
						
							
							fix translation issues in french and fix issues in estimate action
						
						
						
						
						
						
					 | 
					
						2019-11-13 19:33:31 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e1d2888786
					 | 
					
						
						
							
							fix the password length
						
						
						
						
						
						
					 | 
					
						2019-11-13 19:02:03 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						821ef9fc41
					 | 
					
						
						
							
							Merge branch 'fix-issue' into 'master'
						
						
						
						
						
						
						
						fix small issues
See merge request mohit.panjvani/crater-web!12 
						
						
					 | 
					
						2019-11-13 08:35:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad68d68776
					 | 
					
						
						
							
							fix mail-config and modal icon size
						
						
						
						
						
						
					 | 
					
						2019-11-13 11:38:30 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4063984e56
					 | 
					
						
						
							
							fix small issues
						
						
						
						
						
						
					 | 
					
						2019-11-12 20:09:45 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a192e2658a
					 | 
					
						
						
							
							fix conflicts
						
						
						
						
						
						
					 | 
					
						2019-11-12 19:26:43 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17c8225880
					 | 
					
						
						
							
							refactor sweet-alert and add related icons in alert
						
						
						
						
						
						
					 | 
					
						2019-11-12 19:23:49 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2030ce603b
					 | 
					
						
						
							
							change translation message
						
						
						
						
						
						
					 | 
					
						2019-11-12 18:58:19 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b8f4388df
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into sweetalert-on-action
						
						
						
						
						
						
					 | 
					
						2019-11-12 18:07:13 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d08b3d47e
					 | 
					
						
						
							
							add sweetalert on actions and update icon
						
						
						
						
						
						
					 | 
					
						2019-11-12 17:55:51 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4decc56b7c
					 | 
					
						
						
							
							Merge branch 'language-validation' into 'master'
						
						
						
						
						
						
						
						Language and  validation
See merge request mohit.panjvani/crater-web!6 
						
						
					 | 
					
						2019-11-12 10:03:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						134a70d934
					 | 
					
						
						
							
							Merge branch 'linechart-formatmoney' into 'master'
						
						
						
						
						
						
						
						Linechart formatmoney and change rout for mark as sent
See merge request mohit.panjvani/crater-web!3 
						
						
					 | 
					
						2019-11-12 10:02:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						969ca696ca
					 | 
					
						
						
							
							Merge branch 'pdf-templates' into 'master'
						
						
						
						
						
						
						
						fix invoice and estimate templates
See merge request mohit.panjvani/crater-web!4 
						
						
					 | 
					
						2019-11-12 10:01:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73d90f73fd
					 | 
					
						
						
							
							fix validation and language changes
						
						
						
						
						
						
					 | 
					
						2019-11-12 13:03:17 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						905064e0be
					 | 
					
						
						
							
							fix the conflict
						
						
						
						
						
						
					 | 
					
						2019-11-12 11:04:55 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03d18065c6
					 | 
					
						
						
							
							fix the validation
						
						
						
						
						
						
					 | 
					
						2019-11-12 11:00:35 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a68fd4f71e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-small-issue
						
						
						
						
						
						
					 | 
					
						2019-11-12 09:24:06 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						deac667c78
					 | 
					
						
						
							
							add mailconfig in settings
						
						
						
						
						
						
					 | 
					
						2019-11-11 21:01:59 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d82b83adfd
					 | 
					
						
						
							
							change route for mark as sent
						
						
						
						
						
						
					 | 
					
						2019-11-11 18:42:18 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b8fd9f267
					 | 
					
						
						
							
							fix wizard and item select issue
						
						
						
						
						
						
					 | 
					
						2019-11-11 18:25:00 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff3121e0d9
					 | 
					
						
						
							
							Fix translation issues
						
						
						
						
						
						
					 | 
					
						2019-11-11 17:53:47 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae6290108b
					 | 
					
						
						
							
							fix validation and translation issues
						
						
						
						
						
						
					 | 
					
						2019-11-11 13:44:24 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bdf2ba51d6
					 | 
					
						
						
							
							init crater
						
						
						
						
						
						
					 | 
					
						2019-11-11 12:16:00 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |