| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e52421238
					 | 
					
						
						
							
							Merge branch 'fix-alert' into 'master'
						
						
						
						
						
						
						
						refactor sweet-alert and add related icons in alert
See merge request mohit.panjvani/crater-web!11 
						
						
					 | 
					
						2019-11-13 05:46:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80178423ad
					 | 
					
						
						
							
							merge master
						
						
						
						
						
						
					 | 
					
						2019-11-12 20:58:13 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc69046f3b
					 | 
					
						
						
							
							refactor template and deshboard invoice table
						
						
						
						
						
						
					 | 
					
						2019-11-12 20:55:51 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4063984e56
					 | 
					
						
						
							
							fix small issues
						
						
						
						
						
						
					 | 
					
						2019-11-12 20:09:45 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0d4714082c
					 | 
					
						
						
							
							fix conflicts
						
						
						
						
						
						
					 | 
					
						2019-11-12 19:39:59 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9192b26b9d
					 | 
					
						
						
							
							Merge branch 'sweetalert-on-action' into 'master'
						
						
						
						
						
						
						
						add sweet-alert on actions and update icon
See merge request mohit.panjvani/crater-web!8 
						
						
					 | 
					
						2019-11-12 13:37:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2030ce603b
					 | 
					
						
						
							
							change translation message
						
						
						
						
						
						
					 | 
					
						2019-11-12 18:58:19 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						050711ff6e
					 | 
					
						
						
							
							fix conflict
						
						
						
						
						
						
					 | 
					
						2019-11-12 18:41:25 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1f5c17b655
					 | 
					
						
						
							
							fix styles
						
						
						
						
						
						
					 | 
					
						2019-11-12 18:40:27 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						97c84ac2ff
					 | 
					
						
						
							
							change in toastr message
						
						
						
						
						
						
					 | 
					
						2019-11-12 18:05:23 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d08b3d47e
					 | 
					
						
						
							
							add sweetalert on actions and update icon
						
						
						
						
						
						
					 | 
					
						2019-11-12 17:55:51 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4839e57791
					 | 
					
						
						
							
							connect mail settings to api
						
						
						
						
						
						
					 | 
					
						2019-11-12 17:21:06 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						418ad89087
					 | 
					
						
						
							
							fix item selection issue
						
						
						
						
						
						
					 | 
					
						2019-11-12 10:20:57 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						617b0711ee
					 | 
					
						
						
							
							refactor templates and reports
						
						
						
						
						
						
					 | 
					
						2019-11-11 20:24:15 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d31bd7849f
					 | 
					
						
						
							
							fix invoice and estimate templates
						
						
						
						
						
						
					 | 
					
						2019-11-11 19:28:20 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa95f7a725
					 | 
					
						
						
							
							add format money in line chart
						
						
						
						
						
						
					 | 
					
						2019-11-11 16:43:22 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80a761dbe0
					 | 
					
						
						
							
							fix spelling mistakes and reduce logo size
						
						
						
						
						
						
					 | 
					
						2019-11-11 13:56:51 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae6290108b
					 | 
					
						
						
							
							fix validation and translation issues
						
						
						
						
						
						
					 | 
					
						2019-11-11 13:44:24 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e9e87cccb4
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2019-11-11 12:50:21 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bdf2ba51d6
					 | 
					
						
						
							
							init crater
						
						
						
						
						
						
					 | 
					
						2019-11-11 12:16:00 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |