Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								2e88275285
								
							
								
							
						 | 
						
							
							
								
								Chat Updates & Counter Event Modifications
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								03c488c663
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/widgets/app_bar_widget.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								2546fb52a9
								
							
								
							
						 | 
						
							
							
								
								Chat Count Api / Chat Token Updates / Chat Call UI
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3cac5eebbc
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								00dee97bca
								
							
								
							
						 | 
						
							
							
								
								Chat Count Api / Chat Token Updates / Chat Call UI
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								dd0d4b82a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								ab6f265ef4
								
							
								
							
						 | 
						
							
							
								
								Chat Favorite Screen & Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								55187f4e36
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								80e18911b7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								b18ebf7a54
								
							
								
							
						 | 
						
							
							
								
								Chat Favorite Screen & Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								29626ea408
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4ff3a5093b
								
							
								
							
						 | 
						
							
							
								
								Action duration implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								93e7f7c862
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								cffe185cda
								
							
								
							
						 | 
						
							
							
								
								ITG Count fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								ea8fd42abd
								
							
								
							
						 | 
						
							
							
								
								Otp clear & resend fixed
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								ee0e774611
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/colors.dart
#	lib/classes/consts.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								67f4fdef28
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & Favorite Api Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								8ba3dcf43b
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & Favorite Api Implementation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								22ac89e744
								
							
								
							
						 | 
						
							
							
								
								fix issues
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								00e81999de
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'faiz_cs' into 'master'
							
							
							
							
							
							
							
							Updated Banner Design and Success tone on Lottiee
See merge request Cloud_Solution/mohemm-flutter-app!46 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								fe8c6f9060
								
							
								
							
						 | 
						
							
							
								
								Updated Marathon Banner Design
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								221bf28ddd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								7cc110b9a1
								
							
								
							
						 | 
						
							
							
								
								JIRA fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								f06238a93f
								
							
								
							
						 | 
						
							
							
								
								OTP dialog new design
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								96e1be7823
								
							
								
							
						 | 
						
							
							
								
								Chat Delivered&Seen Event Added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								235dc6b1f4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								7408e24245
								
							
								
							
						 | 
						
							
							
								
								Chat Delivered&Seen Event Added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								bf802f3d67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							Development mirza
See merge request Cloud_Solution/mohemm-flutter-app!36 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								ba588cd3a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'faiz_cs' into 'master'
							
							
							
							
							
							
							
							Added Answer Selection Status in Marathon
See merge request Cloud_Solution/mohemm-flutter-app!38 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								11e4da6478
								
							
								
							
						 | 
						
							
							
								
								Added Answer Selected Status
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6e409c77a0
								
							
								
							
						 | 
						
							
							
								
								mark attendance counter & ios nfc fixed 1.0
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								39240b734e
								
							
								
							
						 | 
						
							
							
								
								mark attendance counter & ios nfc fixed
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c87a00df6a
								
							
								
							
						 | 
						
							
							
								
								Jira fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								199a65a994
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_faiz
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								5ed9991428
								
							
								
							
						 | 
						
							
							
								
								Added new Intimmation Screens with Lottie
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8b0bae0891
								
							
								
							
						 | 
						
							
							
								
								Worklist updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								38c7d78db3
								
							
								
							
						 | 
						
							
							
								
								Added UI Components for Marathon Module.. WIP
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								5c848fec87
								
							
								
							
						 | 
						
							
							
								
								Added UI Components for Marathon Module.. WIP
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d200624ac2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								57ebe40b5d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/landing/dashboard_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d26b7e0753
								
							
								
							
						 | 
						
							
							
								
								worklist improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								91abaa8475
								
							
								
							
						 | 
						
							
							
								
								improvements.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5c5da60b12
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f0ec4843b4
								
							
								
							
						 | 
						
							
							
								
								end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								b190a248bf
								
							
								
							
						 | 
						
							
							
								
								Chat Implementation Version 1
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								398880c4ad
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								8d9561b570
								
							
								
							
						 | 
						
							
							
								
								COC changes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								95b60181b1
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								dd26452663
								
							
								
							
						 | 
						
							
							
								
								Fixes & updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c14bfd22db
								
							
								
							
						 | 
						
							
							
								
								Mohemm Android build given to QA
							
							
							
							
							
						 | 
						
							3 years ago |