Commit Graph

38 Commits (e3b7069aa201a0a954cb7368ba4cd619a200a0dc)

Author SHA1 Message Date
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 5 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
Sultan Khan 542335364e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal 2e2a29145c fix merge issues 5 years ago
Mohammad Aljammal 459ba828d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/vital_sign/vital_sign_item.dart
	lib/routes.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
Sultan Khan 8de838a6dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 5 years ago
Sultan Khan 648d9d245d health weather indicator 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
haroon amjad 97b8aeeff5 Version Control finished 5 years ago
Sultan Khan a9cb645833 health weather indicator 5 years ago
Sultan Khan 799fca346b health weather indicator 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
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
Sultan Khan f03a711dff symptom checker gender page updated 5 years ago
Sultan Khan 5c859034d6 voice search 5 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 327c4585a6 family file change 5 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 5 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 5 years ago
Sultan Khan 8ee3b3b557 family files. 5 years ago
Sultan Khan 0bc529f420 login changes 5 years ago
Sultan Khan 8d0834ff3e login inprogress 5 years ago
Sultan Khan c018597d90 confrim login page added 5 years ago
Sultan Khan f8d8e1c685 new pages added 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
Sultan Khan 8dd38a8b3c no message 5 years ago
Sultan Khan 4a0cc17069 login module started 5 years ago