Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								73ff5c4707
								
							
								
							
						 | 
						
							
							
								
								Bug fixes
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								52665fe217
								
							
								
							
						 | 
						
							
							
								
								login issue fixed
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Mirza.Shafique
							
						 | 
						
							
							
							
							
								
							
								62631677ad
								
							
								
							
						 | 
						
							
							
								
								Booking appointment 1.0
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Mirza.Shafique
							
						 | 
						
							
							
							
							
								
							
								0a83cf8241
								
							
								
							
						 | 
						
							
							
								
								Bug Fixis
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								5647ab75e5
								
							
								
							
						 | 
						
							
							
								
								improvements.
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Mirza.Shafique
							
						 | 
						
							
							
							
							
								
							
								5f44dece71
								
							
								
							
						 | 
						
							
							
								
								Ganaric Font and font implementaion
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Mirza.Shafique
							
						 | 
						
							
							
							
							
								
							
								38465eaafb
								
							
								
							
						 | 
						
							
							
								
								Home page icons and drawer
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Mirza.Shafique
							
						 | 
						
							
							
							
							
								
							
								06f877b8d4
								
							
								
							
						 | 
						
							
							
								
								Home page new design & drawer
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								083d696c62
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into development_new_design_2.0
							
							
							
							
							
							
							
							# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart 
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e5fb16ad69
								
							
								
							
						 | 
						
							
							
								
								langauge issue
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								
									
								
								 Sikander Saleem
							
						 | 
						
							
							
							
							
								
							
								f6ae7ed770
								
							
								
							
						 | 
						
							
							
								
								merge changes-4
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Mirza.Shafique
							
						 | 
						
							
							
							
							
								
							
								5dc88f51c3
								
							
								
							
						 | 
						
							
							
								
								Home Page 1.0
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								14ef096c32
								
							
								
							
						 | 
						
							
							
								
								changes and fixes
							
							
							
							
							
						 | 
						
							4 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								bcabd81f88
								
							
								
							
						 | 
						
							
							
								
								BUG FIXES
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								cd7845b1a4
								
							
								
							
						 | 
						
							
							
								
								bug fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								1b770420be
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								9bfd725e4f
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								35c940a209
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								80d96ba785
								
							
								
							
						 | 
						
							
							
								
								Privilege issue fixed
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								e0ebb922ed
								
							
								
							
						 | 
						
							
							
								
								pharmacy fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								1a35fe37b6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e61c26b853
								
							
								
							
						 | 
						
							
							
								
								Auto SMS, Themes, Voice Command
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								da3ad90ddd
								
							
								
							
						 | 
						
							
							
								
								added app-wide route transition animation
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								d33918c932
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								d477481856
								
							
								
							
						 | 
						
							
							
								
								fix security issues in pharmacy
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								ccd2fc5068
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Zohaib Iqbal Kambrani
							
						 | 
						
							
							
							
							
								
							
								dc83b476d6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into ZohaibIqbalKambrani
							
							
							
							
							
							
							
							# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								mosazaid
							
						 | 
						
							
							
							
							
								
							
								2843b1393e
								
							
								
							
						 | 
						
							
							
								
								some design enhancments
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								952e106531
								
							
								
							
						 | 
						
							
							
								
								return privilege
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								18dad434a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								c01246acf0
								
							
								
							
						 | 
						
							
							
								
								hot fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								c9538c6a84
								
							
								
							
						 | 
						
							
							
								
								family files
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								73c8e00852
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								d53031b0e6
								
							
								
							
						 | 
						
							
							
								
								blood type update for family files
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								09a85d9127
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								9c12e949e8
								
							
								
							
						 | 
						
							
							
								
								hot fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								6b1e7587a8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								a0baaac314
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Zohaib Kambrani
							
						 | 
						
							
							
							
							
								
							
								d8bd7d145d
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								9c18c69d90
								
							
								
							
						 | 
						
							
							
								
								hot fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								7bc8fdb819
								
							
								
							
						 | 
						
							
							
								
								fix merge issues
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								6d7cb1b970
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
							
							
							
							
							
							
							
							 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	lib/core/service/AuthenticatedUserObject.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/widgets/drawer/app_drawer_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								7167d58ce2
								
							
								
							
						 | 
						
							
							
								
								fix merge issues
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								aa89a05f1d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
							
							
							
							
							
							
							
							 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								eec67ac930
								
							
								
							
						 | 
						
							
							
								
								big fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								9a578cafc2
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								9e3db622fa
								
							
								
							
						 | 
						
							
							
								
								login loader issue fixed
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Zohaib Kambrani
							
						 | 
						
							
							
							
							
								
							
								6f6ab8d987
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								19f12116c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								de1e352e98
								
							
								
							
						 | 
						
							
							
								
								fix charts and vital sign
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								965c97d262
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								a2e385f282
								
							
								
							
						 | 
						
							
							
								
								family file drawer
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								051bd1e23f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								1f0d01b6cc
								
							
								
							
						 | 
						
							
							
								
								language issue fixed
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								2c50402aa8
								
							
								
							
						 | 
						
							
							
								
								language issue fixed
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								557b8e814f
								
							
								
							
						 | 
						
							
							
								
								voice command
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								9d9d77ee3a
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								c813deea29
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e28209d4e8
								
							
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								ce7a64e86e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								9dfd8a71dc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
							
							
							
							
							
							
							
							 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								542335364e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								c050c3f189
								
							
								
							
						 | 
						
							
							
								
								voice command updated
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								dfa1952f4d
								
							
								
							
						 | 
						
							
							
								
								Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								dc898a799d
								
							
								
							
						 | 
						
							
							
								
								Add Privileges
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Zohaib Kambrani
							
						 | 
						
							
							
							
							
								
							
								27182ee8db
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								92db2b2be9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								603833db37
								
							
								
							
						 | 
						
							
							
								
								login changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								0ac599ea1c
								
							
								
							
						 | 
						
							
							
								
								fix vital Sign
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								8d499704dc
								
							
								
							
						 | 
						
							
							
								
								family file changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								0966269537
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sultan' into 'diplomatic-quarter-live'
							
							
							
							
							
							
							
							Sultan
See merge request Cloud_Solution/diplomatic-quarter!116 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								0ed29be214
								
							
								
							
						 | 
						
							
							
								
								launch
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								91be66ecdd
								
							
								
							
						 | 
						
							
							
								
								family file changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								b785f87dac
								
							
								
							
						 | 
						
							
							
								
								fix App drawer after logout
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								4976870d2e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								875bf10c73
								
							
								
							
						 | 
						
							
							
								
								settings page added
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljmma
							
						 | 
						
							
							
							
							
								
							
								a077d87dd8
								
							
								
							
						 | 
						
							
							
								
								fix user authentication data
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								5bd3c7d9ce
								
							
								
							
						 | 
						
							
							
								
								finish step from notifications_page and create notification_details_page
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Elham Rababah
							
						 | 
						
							
							
							
							
								
							
								9f2beceb22
								
							
								
							
						 | 
						
							
							
								
								First step from notifications_page
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								6fd7a3fa3d
								
							
								
							
						 | 
						
							
							
								
								updates
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								haroon amjad
							
						 | 
						
							
							
							
							
								
							
								d5118bda11
								
							
								
							
						 | 
						
							
							
								
								Login / Register UI fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								29f0402cbd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
							
							
							
							
							
							
							
							 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								53bbafdc2b
								
							
								
							
						 | 
						
							
							
								
								fix Authenticated User Object
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								7b6135a6c7
								
							
								
							
						 | 
						
							
							
								
								voice search
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								8f18d1025a
								
							
								
							
						 | 
						
							
							
								
								voice search
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								2f9885ecf8
								
							
								
							
						 | 
						
							
							
								
								family file changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								327c4585a6
								
							
								
							
						 | 
						
							
							
								
								family file change
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								4c1a8dc38f
								
							
								
							
						 | 
						
							
							
								
								new changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								da6f238c89
								
							
								
							
						 | 
						
							
							
								
								family files changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								621870eca1
								
							
								
							
						 | 
						
							
							
								
								family file changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								8ee3b3b557
								
							
								
							
						 | 
						
							
							
								
								family files.
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								e735855c33
								
							
								
							
						 | 
						
							
							
								
								registration done.
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								8d0834ff3e
								
							
								
							
						 | 
						
							
							
								
								login inprogress
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								3a15c16883
								
							
								
							
						 | 
						
							
							
								
								login changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								76aeeffad7
								
							
								
							
						 | 
						
							
							
								
								login page changes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								192b21a7e7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
							
							
							
							
							
							
							
							# Conflicts:
#	lib/main.dart
#	lib/widgets/input/date_picker/button_actions.dart
#	lib/widgets/input/text_field.dart
#	lib/widgets/others/app_scaffold_widget.dart 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								257cc92691
								
							
								
							
						 | 
						
							
							
								
								add MVVM and di Mohammad Aljammal and Elham Rababah
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								d897463b42
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Sultan Khan
							
						 | 
						
							
							
							
							
								
							
								4a0cc17069
								
							
								
							
						 | 
						
							
							
								
								login module started
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mohammad Aljammal
							
						 | 
						
							
							
							
							
								
							
								198a1854a9
								
							
								
							
						 | 
						
							
							
								
								add documentation Mohammad Aljammal and Elham Rababah
							
							
							
							
							
						 | 
						
							5 years ago |