Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e671f0413d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!22 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								e00e146a76
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								dadaeed10e
								
							
								
							
						 | 
						
							
							
								
								dynamic forms cont.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f2b378e33a
								
							
								
							
						 | 
						
							
							
								
								dynamic forms cont.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								1305e895a1
								
							
								
							
						 | 
						
							
							
								
								fix arabic translation
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								f8651ab49a
								
							
								
							
						 | 
						
							
							
								
								app bar
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								a0ccacf078
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								fad58931f3
								
							
								
							
						 | 
						
							
							
								
								profile
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								44c9a090f9
								
							
								
							
						 | 
						
							
							
								
								fix personal details
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								57f789ca6d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								6529c2aeba
								
							
								
							
						 | 
						
							
							
								
								profile pages
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								74c06203db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								6e86c0ba38
								
							
								
							
						 | 
						
							
							
								
								profile details
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								393e28b32c
								
							
								
							
						 | 
						
							
							
								
								fix profile
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								3fce58b379
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								2887894330
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/login/login_screen.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								ec845756be
								
							
								
							
						 | 
						
							
							
								
								Login Issue Fix's
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								b281efe14c
								
							
								
							
						 | 
						
							
							
								
								fix monthly attendance
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								82570b9ba6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								49bc689351
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								dec5ebe8fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							my attendance working cont-1
See merge request mirza.shafique/mohem_flutter_app!21 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								bee716d77b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								25d020441c
								
							
								
							
						 | 
						
							
							
								
								my attendance working cont-1
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								0e560558dc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into Fatima
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/extensions/widget_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard.dart
#	pubspec.lock
#	pubspec.yaml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								4d9405a8db
								
							
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								339b343c4c
								
							
								
							
						 | 
						
							
							
								
								fix calendar
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								63eef4dea3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								2f395f29df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								ff17adfd09
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								daf8849e37
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!20 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9b5147b565
								
							
								
							
						 | 
						
							
							
								
								merge improvements
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								06b3726d4a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								0974861463
								
							
								
							
						 | 
						
							
							
								
								updated menus
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								97645f3e33
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							Development sikander
See merge request mirza.shafique/mohem_flutter_app!19 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								8ef02fe195
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development_sikander
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								807d4b4046
								
							
								
							
						 | 
						
							
							
								
								item creation added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								9e0a598245
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							purchase order & move order, item history & quotation analysis added.
See merge request mirza.shafique/mohem_flutter_app!18 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a431913bb6
								
							
								
							
						 | 
						
							
							
								
								purchase order & move order, item history & quotation analysis added.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								b898481cf7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'Fatima' into development_mirza
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/extensions/widget_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/landing/dashboard.dart
#	pubspec.lock
#	pubspec.yaml 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								a4fb526b68
								
							
								
							
						 | 
						
							
							
								
								NFC Attendance implement 1.4
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								a2c8747d21
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_sikander' into 'master'
							
							
							
							
							
							
							
							wokrlist api's added & improvements
See merge request mirza.shafique/mohem_flutter_app!17 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								384aa8d9b4
								
							
								
							
						 | 
						
							
							
								
								wokrlist api's added & improvements
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Fatimah Alshammari
							
						 | 
						
							
							
							
							
								
							
								0cd37ce0fa
								
							
								
							
						 | 
						
							
							
								
								fix calendar
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								eb3ddb3d9e
								
							
								
							
						 | 
						
							
							
								
								NFC Attendance implement 1.3
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								35d683a8ae
								
							
								
							
						 | 
						
							
							
								
								NFC Attendance implement 1.0
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Mirza Shafique
							
						 | 
						
							
							
							
							
								
							
								d173da5b07
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development_mirza' into 'main'
							
							
							
							
							
							
							
							Development mirza
See merge request mirza.shafique/mohem_flutter_app!16 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								devmirza121
							
						 | 
						
							
							
							
							
								
							
								68729ddbb9
								
							
								
							
						 | 
						
							
							
								
								NFC Attendance implement
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								029f03f2bc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								da6b935c0b
								
							
								
							
						 | 
						
							
							
								
								subpages changes
							
							
							
							
							
						 | 
						
							4 years ago |