Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								75eab961ce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/notifications.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								ffd894ca28
								
							
								
							
						 | 
						
							
							
								
								Notification To Specific Screen
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5fe9e55813
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request Cloud_Solution/mohemm-flutter-app!139 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								342d75de33
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								dd6627f216
								
							
								
							
						 | 
						
							
							
								
								firebase notification token issue fix.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0a5207b098
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							app life cycle added.
See merge request Cloud_Solution/mohemm-flutter-app!138 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								84a07df310
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0f84f9ae65
								
							
								
							
						 | 
						
							
							
								
								app life cycle added.
							
							
							
							
							
							
							
							file attachment option added on dynamic form. & improvements 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								b0267c9a16
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								698aee3482
								
							
								
							
						 | 
						
							
							
								
								Notification
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								73f5fc0a9a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								229ced2e84
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Chat Fixes
See merge request Cloud_Solution/mohemm-flutter-app!137 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								81a060012e
								
							
								
							
						 | 
						
							
							
								
								Chat Fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								1eca46600d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/api/chat/chat_api_client.dart
#	lib/ui/login/login_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								ef82a081fd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								07dad71610
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir
							
							
							
							
							
							
							
							 Conflicts:
	lib/api/chat/chat_api_client.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								7f9c82d165
								
							
								
							
						 | 
						
							
							
								
								ChatFix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								33da1a103d
								
							
								
							
						 | 
						
							
							
								
								mark attendance session expire fixed
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f8ae5b0987
								
							
								
							
						 | 
						
							
							
								
								mark attendance session expire fixed
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e10ea6b023
								
							
								
							
						 | 
						
							
							
								
								mark attendance session expire fixed
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								03ae216b69
								
							
								
							
						 | 
						
							
							
								
								Chat fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								7152b0d57b
								
							
								
							
						 | 
						
							
							
								
								Chat Fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f4b57a33f9
								
							
								
							
						 | 
						
							
							
								
								local internet connectivity fixed on ios
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2120ca9fb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/development_mirza' into development_mirza
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								5f525f16a0
								
							
								
							
						 | 
						
							
							
								
								local network test
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a97b367c6a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!136 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								311b27cf2b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/marathon/widgets/marathon_details_card.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a9bf383164
								
							
								
							
						 | 
						
							
							
								
								Updates & fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								f7049f2e40
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								c8f9826266
								
							
								
							
						 | 
						
							
							
								
								Permission Issue
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6b56d40349
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'faiz_cs' into 'master'
							
							
							
							
							
							
							
							Sorted the Sequence Number in Question Options and Removed isCorrectOption
See merge request Cloud_Solution/mohemm-flutter-app!135 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								1c402f7215
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								7f02dff689
								
							
								
							
						 | 
						
							
							
								
								Added the Sequence Number in Question Options and Removed isCorrectOption
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								bd10bb4f1d
								
							
								
							
						 | 
						
							
							
								
								Push notifications handler implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								ed220b80a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'faiz_cs' into 'master'
							
							
							
							
							
							
							
							Updating with the DEMO MARATHON
See merge request Cloud_Solution/mohemm-flutter-app!134 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								10ef069a06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								c337b82676
								
							
								
							
						 | 
						
							
							
								
								Pushing before removing the isCorrectOption
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a7d87b7b44
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Microphone Permission Fix
See merge request Cloud_Solution/mohemm-flutter-app!133 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								b152f8a6d6
								
							
								
							
						 | 
						
							
							
								
								Permission Issue
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								1f69ee262d
								
							
								
							
						 | 
						
							
							
								
								Permission Issue
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								a72ac34122
								
							
								
							
						 | 
						
							
							
								
								Updated the text
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c865eca9c9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_haroon' into 'master'
							
							
							
							
							
							
							
							Development haroon
See merge request Cloud_Solution/mohemm-flutter-app!132 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								f933539395
								
							
								
							
						 | 
						
							
							
								
								dialog added to app settings
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c763e16f41
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4d7db61a36
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								df72594f14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							Audio Fix
See merge request Cloud_Solution/mohemm-flutter-app!131 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e685cf188c
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								538fd133aa
								
							
								
							
						 | 
						
							
							
								
								Title Fix On AppBar
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								dbb13515fc
								
							
								
							
						 | 
						
							
							
								
								Audio Fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								377fd48693
								
							
								
							
						 | 
						
							
							
								
								Ios Fix
							
							
							
							
							
						 | 
						
							3 years ago |