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
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
d664a216c6
|
Profile Page and Back Button Click
|
4 years ago |
Mirza.Shafique
|
9c7e8e3637
|
Back Button on Landing Page 1
|
4 years ago |
haroon amjad
|
a819660536
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 years ago |
Sikander Saleem
|
08960867f7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
55df00dcd4
|
h20 today ui (cont.)
|
4 years ago |
haroon amjad
|
a7ccc73c36
|
updates
|
4 years ago |
Mirza.Shafique
|
205b4d6b21
|
Photo view in CMC
|
4 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
|
4 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
|
4 years ago |
Mirza.Shafique
|
ef2bcc1c65
|
Web RTC Design implementation
|
4 years ago |
haroon amjad
|
d9d4720ded
|
pubspec updated
|
4 years ago |
haroon amjad
|
0a90791aca
|
Push notification fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
3f178e3e3f
|
Google_Huawei Map -> AppMap
|
4 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
|
4 years ago |
Mirza.Shafique
|
d865e97ce1
|
Vital Sings Home Page
|
4 years ago |
hussam al-habibeh
|
4b90f16ab9
|
baby age in ovulation period
|
4 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
|
5 years ago |
Mirza.Shafique
|
bbaeec5b85
|
Medical Profile Complete
|
5 years ago |
Sikander Saleem
|
889ae24f07
|
merge changes-3
|
5 years ago |
Sikander Saleem
|
53e4815866
|
no auth ui modifications
|
5 years ago |
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
5 years ago |
Zohaib Iqbal Kambrani
|
08e0ce52c8
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
fix bugs
|
5 years ago |
mosazaid
|
2e33c2b240
|
fix bugs
|
5 years ago |
Mirza.Shafique
|
d37f225c1b
|
Home page 1.2
|
5 years ago |
Mirza.Shafique
|
090556f4d1
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
5 years ago |
Mirza.Shafique
|
5dc88f51c3
|
Home Page 1.0
|
5 years ago |
Sikander Saleem
|
1ec48b9598
|
Poppins font added.
|
5 years ago |
Zohaib Iqbal Kambrani
|
dbf525c484
|
no message
|
5 years ago |
Mirza.Shafique
|
b31813770e
|
Check-In NFC done
|
5 years ago |
Mirza.Shafique
|
107d50826c
|
nfc package test
|
5 years ago |
haroon amjad
|
bcb4f48785
|
build fix
|
5 years ago |
Sultan Khan
|
33465b04e5
|
permission
|
5 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
|
f410ce20ca
|
Packages and Offers in Progress
|
5 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
|
5 years ago |
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
5 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
|
5 years ago |
Zohaib Iqbal Kambrani
|
516df96e21
|
no message
|
5 years ago |
Sultan Khan
|
3e947dda37
|
Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
e20eed2f6e
|
voice command changes merged
|
5 years ago |
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
5 years ago |
Mohammad Aljammal
|
0098345d05
|
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
|
5 years ago |
Mohammad Aljammal
|
29f4e6acb6
|
Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
|
5 years ago |
haroon amjad
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
5 years ago |
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
5 years ago |
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
5 years ago |