Commit Graph

40 Commits (e679c7df0daca8f00dba7b9e3b0f895db777cf37)

Author SHA1 Message Date
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad a32501f3dc My invoices implementation continued 4 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
4 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 4 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
4 years ago
hussam al-habibeh d5c76b5400 jira bugs 4 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
4 years ago
hussam al-habibeh 981e78936e jira bugs 4 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
4 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
4 years ago
mosazaid 2e33c2b240 fix bugs 4 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 4 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 4 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 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
Sultan Khan 60b1688bb4 chatbot 5 years ago
Sultan Khan 9bfd725e4f bug fixes 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 5 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 5 years ago
Zohaib Iqbal Kambrani e2bce87e34 resolve merge conflicts. 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
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal f77d2b497e fix issues 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 5 years ago
haroon amjad e29c6a892e updates 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
haroon amjad db30fbdfd2 implementing livecare 5 years ago
haroon amjad 3a9fa97c91 updates 5 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 5 years ago
Sultan Khan ecfa1756d3 login changes 5 years ago
Sultan Khan 0bc529f420 login changes 5 years ago
Sultan Khan 5a08cb720c login changes 5 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 5 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 5 years ago