Sultan Khan
|
11ffed2ae3
|
bug fixes
|
3 years ago |
haroon amjad
|
cbbca5ce86
|
Merge branch 'development' into Haroon
|
3 years ago |
 Sikander Saleem
|
458dc2474b
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
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
|
e91cf4762a
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
d865e97ce1
|
Vital Sings Home Page
|
3 years ago |
|
Sikander Saleem
|
b3fd1cb93d
|
lab result detail flow chart screen & improvement.
|
3 years ago |
Fatimah Alshammari
|
787b55a803
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Fatimah Alshammari
|
34ccb132dc
|
fixed issues
|
3 years ago |
|
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
3 years ago |
Sultan khan
|
b8d75b5604
|
Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue
See merge request Cloud_Solution/diplomatic-quarter!356
|
3 years ago |
|
haroon amjad
|
cbbef80bd5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
haroon amjad
|
eadba3f767
|
Working on livecare appointment booking page
|
3 years ago |
|
Sultan khan
|
3c2a89cd8e
|
Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and sugar blood
See merge request Cloud_Solution/diplomatic-quarter!354
|
3 years ago |
Elham Rababh
|
1568698b98
|
fix issues related to wight and sugar blood
|
3 years ago |
|
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
3 years ago |
hussam al-habibeh
|
8f5fef87e9
|
add blood pressure translation issue
|
3 years ago |
|
hussam al-habibeh
|
a33a6b0b2f
|
push request after conflict resolve
|
3 years ago |
|
hussam al-habibeh
|
0a3c44b5e8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
3 years ago |
haroon amjad
|
5c8e9f4e19
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
|
3 years ago |
|
haroon amjad
|
2242b78116
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
haroon amjad
|
e28fdaade1
|
Dental Invoices implementation completed
|
3 years ago |
Zohaib Iqbal Kambrani
|
c215b22cf7
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
fixes
registration
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
f442cc251c
|
Pre Post Images Dental Doctor Profile
|
3 years ago |
|
Sikander Saleem
|
d1b45c8bcc
|
Merge branch 'login_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
85c759a4a5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
5b778f0493
|
appointment ui (cont.) & improvement.
|
3 years ago |
|
Sultan Khan
|
1586f02542
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
6b7eaaafb9
|
fixes
|
3 years ago |
|
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
3 years ago |
|
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
3 years ago |
|
Sikander Saleem
|
ff55ae1908
|
improvements
|
3 years ago |
|
Sikander Saleem
|
bb3d11ccf8
|
remove spaces.
|
3 years ago |
|
Sikander Saleem
|
bb9d1bfcd5
|
improvements
|
3 years ago |
|
Sikander Saleem
|
80c50e29bf
|
Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
|
3 years ago |
|
Sikander Saleem
|
4db432b351
|
lab results working(cont.) & improvements
|
3 years ago |
|
Mirza.Shafique
|
38465eaafb
|
Home page icons and drawer
|
3 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
|
3 years ago |
|
hussam al-habibeh
|
d3868844de
|
Medication availability
|
3 years ago |
|
Mirza.Shafique
|
1bea9d39b5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
06f877b8d4
|
Home page new design & drawer
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
3 years ago |
|
Sultan Khan
|
97d7f9225e
|
package name changed
|
3 years ago |
|
haroon amjad
|
709877b5f1
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
|
3 years ago |
|
haroon amjad
|
90db04cee1
|
Jira Fixes
|
3 years ago |
|
Sikander Saleem
|
2d64426cd4
|
Merge branch 'login_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
70614d3555
|
merge improvements-1.
|
3 years ago |
|
Mirza.Shafique
|
99c6318410
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
2d62822536
|
Medical Profile Page improvements
|
3 years ago |
|
Sikander Saleem
|
f482595d6b
|
merge improvements.
|
3 years ago |
|
Sikander Saleem
|
083d696c62
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Mirza.Shafique
|
4ebf5f900b
|
improvements.
|
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
|
f6ae7ed770
|
merge changes-4
|
3 years ago |
|
Sikander Saleem
|
c07a8f54c7
|
merge changes-2
|
3 years ago |
|
Sultan Khan
|
7c398ba40d
|
bug fix
|
3 years ago |
|
Mirza.Shafique
|
3c438406b5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Mirza.Shafique
|
49bfa2e9a7
|
Home page 1.3
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
3 years ago |
|
Sultan Khan
|
d88e3faa6b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
d6fd03b571
|
CONFIG
|
3 years ago |
|
Sultan khan
|
ba32a37a17
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!339
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
3 years ago |
|
Sikander Saleem
|
907d90b987
|
login ui and forgot password ui added.
|
3 years ago |
|
Sultan Khan
|
ed20ba65b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
23ca95b9b6
|
bug fixes
|
3 years ago |
|
Haroon Amjad
|
47e521fe1d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
3 years ago |
|
Sultan Khan
|
6442ce178d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan khan
|
a67e320a8e
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
|
3 years ago |
|
Sultan Khan
|
8766a69928
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 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
|
3 years ago |
|
hussam al-habibeh
|
981e78936e
|
jira bugs
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
3 years ago |
|
Mirza.Shafique
|
b0dfbef52a
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
|
Mirza.Shafique
|
d37f225c1b
|
Home page 1.2
|
3 years ago |
|
Sikander Saleem
|
3707b13986
|
login type ui & icons added.
|
3 years ago |
|
Sultan Khan
|
c88bea4461
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
9acb5b087d
|
bug fixes
|
3 years ago |
|
Sikander Saleem
|
8b2feb03ea
|
last login and login options ui.
|
3 years ago |
|
Sultan khan
|
9196367da4
|
Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
|
3 years ago |
|
Sultan khan
|
f54b9a63aa
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
|
3 years ago |
|
Mirza.Shafique
|
2fda47baf6
|
Medical Profile Buttons Lock
|
3 years ago |
|
Haroon Amjad
|
213d104d57
|
Covid test procedure selection implemented
|
3 years ago |
|
Sultan khan
|
487d63ec7f
|
Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC
See merge request Cloud_Solution/diplomatic-quarter!326
|
3 years ago |
|
Sikander Saleem
|
eb9005510d
|
bug fixes and insurance approvals improvements.
|
3 years ago |
|
Sultan Khan
|
3c2539d5b9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
14ef096c32
|
changes and fixes
|
3 years ago |
|
Mirza.Shafique
|
b31813770e
|
Check-In NFC done
|
3 years ago |
|
Haroon Amjad
|
fde658fd5d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
Mirza.Shafique
|
fb0a67e5bd
|
PAP 828 and 792 issue fix
|
3 years ago |
|
Mirza.Shafique
|
e934e7cd2c
|
Merge Fix
|
3 years ago |
|
haroon amjad
|
4504b4bf75
|
config
|
3 years ago |
|
haroon amjad
|
f310f9d0ab
|
config
|
3 years ago |
|
haroon amjad
|
0d2a91c124
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
3 years ago |
|
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
3 years ago |
|
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
3 years ago |
|
haroon amjad
|
bcb4f48785
|
build fix
|
3 years ago |
|
Sultan Khan
|
b4a7235fc8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
hussam al-habibeh
|
854352d9ce
|
jira bugs
|
3 years ago |
|
Sikander Saleem
|
1f01f40ad8
|
PAP-681 fixed, H2O Unit changing & reflection.
|
3 years ago |
|
Sultan Khan
|
da2df9b348
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
bcabd81f88
|
BUG FIXES
|
3 years ago |
Mohammad Aljammal
|
25d5105caf
|
Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
|
4 years ago |
|
Elham Rababah
|
2a47564c37
|
PAP-607: fix issue
|
4 years ago |
|
Fatimah Alshammari
|
174e0d9673
|
Merge branch 'development' into pharmacy-Fatima
|
4 years ago |
|
Fatimah Alshammari
|
2481e4c9ea
|
fixed categories issues and home page button
|
4 years ago |
|
Sultan Khan
|
8c9c309abb
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
cd7845b1a4
|
bug fix
|
4 years ago |
|
haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
|
haroon amjad
|
353a5157f2
|
fixes
|
4 years ago |
|
Sultan Khan
|
0245875358
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
3d6858d0ec
|
bug fixes
|
4 years ago |
|
Fatimah Alshammari
|
235fdfba54
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
|
4 years ago |
|
Fatimah Alshammari
|
71a393df68
|
fixed categories issue
|
4 years ago |
|
haroon amjad
|
f754e48034
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
|
haroon amjad
|
49c454b132
|
fixes
|
4 years ago |
mosazaid
|
b623bd0dce
|
Merge branch 'development' into fix_bugs
|
4 years ago |
|
mosazaid
|
e5474b3062
|
fix perscription pages bugs
|
4 years ago |
Mohammad Aljammal
|
126fad61c0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
Conflicts:
lib/core/service/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
53e4dfa99d
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!292
|
4 years ago |
|
Mohammad Aljammal
|
7c1fd8043b
|
fix chart and eye and balance
|
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 |
|
hussam al-habibeh
|
f9b8191a5e
|
jira bugs
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
6f2c947687
|
Packages And offers..
|
4 years ago |
|
haroon amjad
|
9c1fdf96f4
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
33e1bf8103
|
Jira fixes
|
4 years ago |
|
haroon amjad
|
accc39d972
|
jira bug fixes
|
4 years ago |
|
Sultan Khan
|
ca2a48e860
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
0445011e53
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
ad88f6de04
|
fix theme issues
|
4 years ago |
|
haroon amjad
|
454957ebba
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
|
4 years ago |
|
Sultan Khan
|
616212828d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
4 years ago |
|
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
4 years ago |
|
haroon amjad
|
ed3dba3eb3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
b9a12341d5
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
4dcb70d7eb
|
Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
|
4 years ago |
|
hussam al-habibeh
|
a534b1415e
|
products filtering fix
|
4 years ago |
|
Mohammad Aljammal
|
861dba9a94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
ec401d4848
|
Done Ed online
|
4 years ago |
|
Sultan Khan
|
a6196d3c30
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
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
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
4 years ago |
|
Fatimah Alshammari
|
c629fcb85c
|
fixed recommended products new design
|
4 years ago |
enadhilal
|
0cb493d56c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |