Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0e329e8e2b
								
							
								
							
						 | 
						
							
							
								
								ticket balance value display fixed & infant added in value.
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								0f84f9ae65
								
							
								
							
						 | 
						
							
							
								
								app life cycle added.
							
							
							
							
							
							
							
							file attachment option added on dynamic form. & improvements 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								10ef069a06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								a72ac34122
								
							
								
							
						 | 
						
							
							
								
								Updated the text
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a165ac2e91
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								5592989b44
								
							
								
							
						 | 
						
							
							
								
								Added Demo Marathon Module
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								54961c875f
								
							
								
							
						 | 
						
							
							
								
								Ios Stream Audio
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								24c118a66e
								
							
								
							
						 | 
						
							
							
								
								Removed GapTime for last question and some minor bugs fixed!
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								d9749fc402
								
							
								
							
						 | 
						
							
							
								
								Updated NoWinnerFoundDesign and some Logical Up gradations
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								660fdb63dd
								
							
								
							
						 | 
						
							
							
								
								Updates & fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								86d25d3ecc
								
							
								
							
						 | 
						
							
							
								
								Added Privileged logic for Marathon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								8ae8f6d2fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/generated/codegen_loader.g.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								8a3ca3135b
								
							
								
							
						 | 
						
							
							
								
								Pushing after resolving multiple times API calling issue
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								810920a934
								
							
								
							
						 | 
						
							
							
								
								Pushing after resolving multiple times API calling issue
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								29c9caddde
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into fatima
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/misc/request_submit_screen.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								c51af6522c
								
							
								
							
						 | 
						
							
							
								
								fix issues
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								603ff1b19f
								
							
								
							
						 | 
						
							
							
								
								Committing after API replacement from SignalR => InProgress
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								96e52abbb9
								
							
								
							
						 | 
						
							
							
								
								Committing before reverting from SignalR to Apis
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								49b57cae08
								
							
								
							
						 | 
						
							
							
								
								Code Reformatting and Added Logics
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								c57f6e5be3
								
							
								
							
						 | 
						
							
							
								
								Added QuestionsAnswer Statuses Handling
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								1fb585a438
								
							
								
							
						 | 
						
							
							
								
								Chat Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								670a5fbc03
								
							
								
							
						 | 
						
							
							
								
								Chat Favorite Screen & Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								83aabd0555
								
							
								
							
						 | 
						
							
							
								
								Chat Favorite Screen & Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								55ff08c3f3
								
							
								
							
						 | 
						
							
							
								
								Chat Favorite Screen & Fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								221bf28ddd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								7cc110b9a1
								
							
								
							
						 | 
						
							
							
								
								JIRA fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								mirza.shafique
							
						 | 
						
							
							
							
							
								
							
								5880e22771
								
							
								
							
						 | 
						
							
							
								
								merge fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								f06238a93f
								
							
								
							
						 | 
						
							
							
								
								OTP dialog new design
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								79774416b4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into fatima
							
							
							
							
							
							
							
							# Conflicts:
#	lib/generated/codegen_loader.g.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								69ded3dc43
								
							
								
							
						 | 
						
							
							
								
								fix my request
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								1cd7cd4d76
								
							
								
							
						 | 
						
							
							
								
								issues fixed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								5ed9991428
								
							
								
							
						 | 
						
							
							
								
								Added new Intimmation Screens with Lottie
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								3d7b80b8a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/generated/codegen_loader.g.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								60e7b5a2a0
								
							
								
							
						 | 
						
							
							
								
								Adjusted the font settings
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								ab59821428
								
							
								
							
						 | 
						
							
							
								
								Merge conflicts resolved
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								3c6e4a725f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								f515c0b39a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into fatima
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								7b4fe5bcbc
								
							
								
							
						 | 
						
							
							
								
								fix issues
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								38c7d78db3
								
							
								
							
						 | 
						
							
							
								
								Added UI Components for Marathon Module.. WIP
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								defa8a8adb
								
							
								
							
						 | 
						
							
							
								
								redirection added on worklist detail when approve or reject.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								FaizHashmiCS22
							
						 | 
						
							
							
							
							
								
							
								5c848fec87
								
							
								
							
						 | 
						
							
							
								
								Added UI Components for Marathon Module.. WIP
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								5b5cc16b90
								
							
								
							
						 | 
						
							
							
								
								Advanced Search implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								200b56a992
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								91abaa8475
								
							
								
							
						 | 
						
							
							
								
								improvements.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								d61315a5fe
								
							
								
							
						 | 
						
							
							
								
								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 |