Commit Graph

199 Commits (680dcfc255de48abc64d1d492824729c2639946c)

Author SHA1 Message Date
haroon amjad 12a58856e5 Chart fix & In-App update implemented 3 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 3 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 3 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 3 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 3 years ago
haroon amjad a7ccc73c36 updates 3 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 3 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
3 years ago
Mirza.Shafique ef2bcc1c65 Web RTC Design implementation 3 years ago
haroon amjad d9d4720ded pubspec updated 3 years ago
haroon amjad 0a90791aca Push notification fixes 3 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 3 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 3 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 3 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago
Sikander Saleem 889ae24f07 merge changes-3 3 years ago
Sikander Saleem 53e4815866 no auth ui modifications 3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
3 years ago
mosazaid 2e33c2b240 fix bugs 3 years ago
Mirza.Shafique d37f225c1b Home page 1.2 3 years ago
Mirza.Shafique 090556f4d1 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 3 years ago
Sikander Saleem 1ec48b9598 Poppins font added. 3 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 years ago
Mirza.Shafique 107d50826c nfc package test 3 years ago
haroon amjad bcb4f48785 build fix 3 years ago
Sultan Khan 33465b04e5 permission 3 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 4 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
4 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 4 years ago
Fatimah Alshammari 747763c4be Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
Fatimah Alshammari 42bf76f712 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 4 years ago
Sultan Khan 3e947dda37 Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan e20eed2f6e voice command changes merged 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 4 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 4 years ago