Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								f72f49c719
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								580c7d62f5
								
							
								
							
						 | 
						
							
							
								
								some fixes while testing
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a59656184f
								
							
								
							
						 | 
						
							
							
								
								session log out check change.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0e329e8e2b
								
							
								
							
						 | 
						
							
							
								
								ticket balance value display fixed & infant added in value.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								0c7771dab9
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								7257fa88cc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								9a2a85f848
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6749074479
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								b227f11c7b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								59885b29f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_aamir' into 'master'
							
							
							
							
							
							
							
							notification to chat navigate
See merge request Cloud_Solution/mohemm-flutter-app!142 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a07563e7b1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								9dd53ad3ab
								
							
								
							
						 | 
						
							
							
								
								Push notification fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								61904ca5f7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								3b2ef69f7c
								
							
								
							
						 | 
						
							
							
								
								Offers and discount and Item for sale changes done.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								787d6d7ab2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'master'
							
							
							
							
							
							
							
							Development mirza
See merge request Cloud_Solution/mohemm-flutter-app!140 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								aa511f02ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								948689b67a
								
							
								
							
						 | 
						
							
							
								
								Notification To Specific Screen
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								7e235c9d8c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								70861807c5
								
							
								
							
						 | 
						
							
							
								
								Resolved VideoPlayer Bug on IOS
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								be58dfdee1
								
							
								
							
						 | 
						
							
							
								
								isAuthentication fixed in API Client
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 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
							
						 | 
						
							
							
							
							
								
							
								dd6627f216
								
							
								
							
						 | 
						
							
							
								
								firebase notification token issue fix.
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								698aee3482
								
							
								
							
						 | 
						
							
							
								
								Notification
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								5f525f16a0
								
							
								
							
						 | 
						
							
							
								
								local network test
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								c8f9826266
								
							
								
							
						 | 
						
							
							
								
								Permission Issue
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								10ef069a06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								c337b82676
								
							
								
							
						 | 
						
							
							
								
								Pushing before removing the isCorrectOption
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								f933539395
								
							
								
							
						 | 
						
							
							
								
								dialog added to app settings
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								c763e16f41
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							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 |