haroon amjad
|
68294690a1
|
prescription reminders added
|
4 years ago |
devmirza121
|
f3b7a5c318
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
69b1dd6533
|
Medical Reminder
|
4 years ago |
Sikander Saleem
|
044c442ce0
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/parent_categorise_page.dart
|
4 years ago |
Sikander Saleem
|
5a8c887117
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
00f63cd288
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
014074c414
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
4 years ago |
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
haroon amjad
|
f4ccecc1af
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue
See merge request Cloud_Solution/diplomatic-quarter!516
|
4 years ago |
Fatimah Alshammari
|
adfa707eda
|
fix issue
|
4 years ago |
haroon amjad
|
d4e71fd8ec
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart back button
See merge request Cloud_Solution/diplomatic-quarter!514
|
4 years ago |
Elham Rababh
|
275871bc39
|
fix addcustomeraddress
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
hussam al-habibeh
|
b09bc3bef9
|
merge dev to hussam pharmacy fix
|
4 years ago |
hussam al-habibeh
|
1a382bfc80
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/config/config.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
lib/pages/pharmacies/screens/product-details/product-detail.dart
lib/pages/sub_categorise_page.dart
|
4 years ago |
haroon amjad
|
a74a6d5bc8
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!499
|
4 years ago |
devmirza121
|
6575456d3b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
devmirza121
|
dc3d3bc772
|
Health Calculator 5.0
|
4 years ago |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
4 years ago |
haroon amjad
|
70304427f9
|
Doc specialty fix
|
4 years ago |
devmirza121
|
590b795356
|
Health Calculator 4.0 marge
|
4 years ago |
devmirza121
|
a131f24952
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
devmirza121
|
1d1708bdcc
|
Health Calculator 4.0
|
4 years ago |
hussam al-habibeh
|
b2b786d157
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
4 years ago |
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
4 years ago |
haroon amjad
|
ea745f1b9f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
efe8dea9a9
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!489
|
4 years ago |
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
4 years ago |
devmirza121
|
6225f2468d
|
Health Calculator 3.0
|
4 years ago |
devmirza121
|
d4eab13982
|
Health Calculator 2.0
|
4 years ago |
devmirza121
|
e13d64dbf7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
4 years ago |
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
4 years ago |
Fatimah Alshammari
|
239d2c1036
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e1e31de818
|
Lakum fixes
|
4 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
4 years ago |
haroon amjad
|
be771917f0
|
pharmacy fixes
|
4 years ago |
Fatimah Alshammari
|
28678633e7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
4 years ago |
Fatimah Alshammari
|
78fc77159c
|
fix lakum issues
|
4 years ago |
haroon amjad
|
585e26b091
|
Registration fix
|
4 years ago |
Sikander Saleem
|
d6a5f68312
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
4 years ago |
Sikander Saleem
|
cd81f05a8d
|
laser clinic design (cont.)
|
4 years ago |
haroon amjad
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
4 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
4 years ago |