haroon amjad
							
						 | 
						
							
							
							
							
								
							
								1ebcbd1079
								
							
								
							
						 | 
						
							
							
								
								ERM Channel Audio playback implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4bac19f9b8
								
							
								
							
						 | 
						
							
							
								
								Platform ID & Huawei fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								8f1c223469
								
							
								
							
						 | 
						
							
							
								
								removed google api availability
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								601a0cdbfd
								
							
								
							
						 | 
						
							
							
								
								Added test Dialog for Huawei
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								8439b58759
								
							
								
							
						 | 
						
							
							
								
								Added Huawei Checks
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								5e22bcc1da
								
							
								
							
						 | 
						
							
							
								
								ERM Channel
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								91eb51e42f
								
							
								
							
						 | 
						
							
							
								
								marathon updates & DateFormat fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								be32b9c4a2
								
							
								
							
						 | 
						
							
							
								
								attendance fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								5bb998a8d2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into faiz_cs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8a393c1e73
								
							
								
							
						 | 
						
							
							
								
								App update screen implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								b3782f6342
								
							
								
							
						 | 
						
							
							
								
								updates & fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								bcf67895b9
								
							
								
							
						 | 
						
							
							
								
								Dynamic forms & my team fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								3f7e1cd0be
								
							
								
							
						 | 
						
							
							
								
								Pushing before updating API Structure
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								631752cffa
								
							
								
							
						 | 
						
							
							
								
								fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a39e6808d7
								
							
								
							
						 | 
						
							
							
								
								fixes & updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4a513c08d9
								
							
								
							
						 | 
						
							
							
								
								fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								43fb34c218
								
							
								
							
						 | 
						
							
							
								
								fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								ecaede0deb
								
							
								
							
						 | 
						
							
							
								
								Updates & fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6efc07fcab
								
							
								
							
						 | 
						
							
							
								
								Jira fixes
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								c500da9a18
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8b0bae0891
								
							
								
							
						 | 
						
							
							
								
								Worklist updates
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Aamir Muhammad
							
						 | 
						
							
							
							
							
								
							
								57ebe40b5d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/ui/landing/dashboard_screen.dart 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a45b6aece2
								
							
								
							
						 | 
						
							
							
								
								improvements
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4b935f1dc5
								
							
								
							
						 | 
						
							
							
								
								leave balance dashboard added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								fb2924964b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_haroon
							
							
							
							
							
							
							
							# Conflicts:
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2f6e40da46
								
							
								
							
						 | 
						
							
							
								
								add leave balance cont.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								a855e535cd
								
							
								
							
						 | 
						
							
							
								
								Item for sale implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2f013ba1ad
								
							
								
							
						 | 
						
							
							
								
								lint rules added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								0786a1fa03
								
							
								
							
						 | 
						
							
							
								
								lint rules added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								2966ca129c
								
							
								
							
						 | 
						
							
							
								
								monthly pay slip improvement
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f1c36b5821
								
							
								
							
						 | 
						
							
							
								
								monthly pay slip added.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e045374703
								
							
								
							
						 | 
						
							
							
								
								Not found svg added, Pending transactions, Announcements.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								427c5fb5b6
								
							
								
							
						 | 
						
							
							
								
								Pending Transactions implemented
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								959750da9b
								
							
								
							
						 | 
						
							
							
								
								ticket request cont.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								ae0a788728
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9cc86751eb
								
							
								
							
						 | 
						
							
							
								
								missing swipe cont
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								fad58931f3
								
							
								
							
						 | 
						
							
							
								
								profile
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9b5147b565
								
							
								
							
						 | 
						
							
							
								
								merge improvements
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								4817781fe1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into development_sikander
							
							
							
							
							
							
							
							# Conflicts:
#	lib/provider/dashboard_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a431913bb6
								
							
								
							
						 | 
						
							
							
								
								purchase order & move order, item history & quotation analysis added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								68729ddbb9
								
							
								
							
						 | 
						
							
							
								
								NFC Attendance implement
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								6b9ea200ad
								
							
								
							
						 | 
						
							
							
								
								login flow added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e3d331a223
								
							
								
							
						 | 
						
							
							
								
								loading icon added
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f1beefbc46
								
							
								
							
						 | 
						
							
							
								
								login apis, models & forgot password screen added.
							
							
							
							
							
						 | 
						
							4 years ago |