Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								581e6de897
								
							
								
							
						 | 
						
							
							
								
								fix issues
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								38c6acbd7d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								31fba1f8e6
								
							
								
							
						 | 
						
							
							
								
								worklist animation fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								0fb4a749a4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								f752331767
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Hub Reconnection Fix
See merge request Cloud_Solution/mohemm-flutter-app!84 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8133542ae0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								21c7597026
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								abc586b81e
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								8d5cc7ed23
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								62acd531b0
								
							
								
							
						 | 
						
							
							
								
								fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								64ba4cdad9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Fixes & User Chat Counter & Read Event & Chat Images API With Encryption.
See merge request Cloud_Solution/mohemm-flutter-app!81 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								f63e0e1e7c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/work_list/worklist_detail_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e505a9fa8c
								
							
								
							
						 | 
						
							
							
								
								fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								4e96108207
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								0f13ab65d6
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								3e1b24eb00
								
							
								
							
						 | 
						
							
							
								
								Committing before reverting from SignalR to Apis
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								96e52abbb9
								
							
								
							
						 | 
						
							
							
								
								Committing before reverting from SignalR to Apis
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								85be372ad8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into fatima
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/leave_balance/add_leave_balance_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								9d0bf4fe7e
								
							
								
							
						 | 
						
							
							
								
								fix issues
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								0db4a5a7cd
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								fb97319164
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								76c3c5c3ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								6a3c6a25d0
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								13a7f60d67
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e6f22e5933
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							worklist animation & loader
See merge request Cloud_Solution/mohemm-flutter-app!82 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								ef5136ebfa
								
							
								
							
						 | 
						
							
							
								
								worklist animation & loader
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								3e666eb6be
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								a08f1c6d77
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								00f3d268ed
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								f6f801f9cf
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & User Chat Counter
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c9dd403b23
								
							
								
							
						 | 
						
							
							
								
								subordinate leave fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a947b759f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								0099ba8a61
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
See merge request Cloud_Solution/mohemm-flutter-app!80 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c7dca3c377
								
							
								
							
						 | 
						
							
							
								
								Jira fixes for announcements & attachments
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								cecb2d59e9
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								49b57cae08
								
							
								
							
						 | 
						
							
							
								
								Code Reformatting and Added Logics
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ab6c221cdb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							marathon api const added.
See merge request Cloud_Solution/mohemm-flutter-app!79 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								741259505d
								
							
								
							
						 | 
						
							
							
								
								marathon api const added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								3438b9c174
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a619380df8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!78 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								93901ce444
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'faiz_cs' into 'master'
							
							
							
							
							
							
							
							Integrated Questions API and Answer Selection -> InProgress
See merge request Cloud_Solution/mohemm-flutter-app!77 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4eb8cca7d2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sultan-dev' into 'master'
							
							
							
							
							
							
							
							basic details issue fixed
See merge request Cloud_Solution/mohemm-flutter-app!76 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f5684ab27e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								b718f96c3a
								
							
								
							
						 | 
						
							
							
								
								counter direction issue fix.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								492b6b5e34
								
							
								
							
						 | 
						
							
							
								
								basic details issue fixed
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								01a37d253e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
See merge request Cloud_Solution/mohemm-flutter-app!75 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								cd0b00021d
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								46de4b88ab
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/provider/chat_provider_model.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								3309541142
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes & Chat Media Preview Api Implementation / On Msg Received Image
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								2f825151a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/marathon/marathon_intro_screen.dart
#	lib/ui/marathon/marathon_provider.dart
#	lib/ui/marathon/marathon_screen.dart
#	lib/ui/marathon/marathon_winner_selection.dart
#	lib/ui/marathon/widgets/question_card.dart
#	pubspec.yaml 
							
						 | 
						
							3 years ago |