| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2546d96b5
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web
						
						
						
						
						
						
					 | 
					
						2019-11-14 18:11:06 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						447c1af517
					 | 
					
						
						
							
							fix estimate description padding
						
						
						
						
						
						
					 | 
					
						2019-11-14 18:10:48 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						297e7c9cd1
					 | 
					
						
						
							
							Merge branch 'status-color-crater-web' into 'master'
						
						
						
						
						
						
						
						Status color
See merge request mohit.panjvani/crater-web!20 
						
						
					 | 
					
						2019-11-14 12:31:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e04a8d0a5
					 | 
					
						
						
							
							add media query in modals and pc in item units
						
						
						
						
						
						
					 | 
					
						2019-11-14 16:28:09 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8fc1ef9348
					 | 
					
						
						
							
							status color
						
						
						
						
						
						
					 | 
					
						2019-11-14 15:05:39 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						85cc6427e9
					 | 
					
						
						
							
							status color
						
						
						
						
						
						
					 | 
					
						2019-11-14 14:54:12 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						441b6bb370
					 | 
					
						
						
							
							add update app on settings
						
						
						
						
						
						
					 | 
					
						2019-11-13 21:08:15 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d08b3d47e
					 | 
					
						
						
							
							add sweetalert on actions and update icon
						
						
						
						
						
						
					 | 
					
						2019-11-12 17:55:51 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						617b0711ee
					 | 
					
						
						
							
							refactor templates and reports
						
						
						
						
						
						
					 | 
					
						2019-11-11 20:24:15 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80a761dbe0
					 | 
					
						
						
							
							fix spelling mistakes and reduce logo size
						
						
						
						
						
						
					 | 
					
						2019-11-11 13:56:51 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bdf2ba51d6
					 | 
					
						
						
							
							init crater
						
						
						
						
						
						
					 | 
					
						2019-11-11 12:16:00 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |