Sultan khan
							
						 | 
						
							
							
							
							
								
							
								2f2a8f3f8f
								
							
								
							
						 | 
						
							
							
								
								search lab result screen added
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								efb22aec4e
								
							
								
							
						 | 
						
							
							
								
								prescription details page implemented
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								e41ffd583d
								
							
								
							
						 | 
						
							
							
								
								changes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								3e50a3c89d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aamir' into faiz_dev1
							
							
							
							
							
							
							
							# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								6e05ca15cf
								
							
								
							
						 | 
						
							
							
								
								adding the login function
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								cf1908b44a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								85fac13314
								
							
								
							
						 | 
						
							
							
								
								changes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								712e11c69a
								
							
								
							
						 | 
						
							
							
								
								prescription details page implementation contd.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								32fadb8ad9
								
							
								
							
						 | 
						
							
							
								
								completed login function
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								8bc49929d4
								
							
								
							
						 | 
						
							
							
								
								prescription orders list page implemented
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6f07bc7c2c
								
							
								
							
						 | 
						
							
							
								
								Radiology Orders implemented
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								4c241b0dac
								
							
								
							
						 | 
						
							
							
								
								Lab orders implemented
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								ed24365eff
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev_aamir
							
							
							
							
							
							
							
							# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								f5e655fd35
								
							
								
							
						 | 
						
							
							
								
								Lab order API implemented
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Haroon Amjad
							
						 | 
						
							
							
							
							
								
							
								a77fc49c68
								
							
								
							
						 | 
						
							
							
								
								lab result changes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								
								 haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e044fc8c5e
								
							
								
							
						 | 
						
							
							
								
								lab implementation contd.
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								488636a13f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_aamir' into faiz_dev1
							
							
							
							
							
							
							
							# Conflicts:
#	lib/features/authentication/authentication_view_model.dart 
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								572fcef0f1
								
							
								
							
						 | 
						
							
							
								
								checkUserAuth
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								aamir-csol
							
						 | 
						
							
							
							
							
								
							
								d1e1154bdb
								
							
								
							
						 | 
						
							
							
								
								changes
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								c6a95fe7d7
								
							
								
							
						 | 
						
							
							
								
								latest push after master merged
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								9509d4a192
								
							
								
							
						 | 
						
							
							
								
								completed the deviceapi with new architecture
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								6bc7af00bc
								
							
								
							
						 | 
						
							
							
								
								completed the deviceapi with new architecture
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								4e010bb2cf
								
							
								
							
						 | 
						
							
							
								
								initial commit
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Sultan khan
							
						 | 
						
							
							
							
							
								
							
								d3aff9f93d
								
							
								
							
						 | 
						
							
							
								
								updating structure
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								faizatflutter
							
						 | 
						
							
							
							
							
								
							
								45e868adba
								
							
								
							
						 | 
						
							
							
								
								pushed new API
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								357cf4392e
								
							
								
							
						 | 
						
							
							
								
								Updated architecture
							
							
							
							
							
						 | 
						
							2 months ago | 
						
					
				
					
						
							
							
								 
								Faiz Hashmi
							
						 | 
						
							
							
							
							
								
							
								d65dc4ea89
								
							
								
							
						 | 
						
							
							
								
								initial commit
							
							
							
							
							
						 | 
						
							2 months ago |