 Sikander Saleem
|
8367fc09f3
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
|
3 years ago |
|
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
3 years ago |
Mirza.Shafique
|
d2b2b4063d
|
Booking appointment 1.1
|
3 years ago |
haroon amjad
|
72dbdd2c2b
|
Merge branch 'development' into Haroon
|
3 years ago |
|
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
3 years ago |
|
haroon amjad
|
73097d15de
|
Covid Lab result generate certificate implemented
|
3 years ago |
|
Mirza.Shafique
|
62631677ad
|
Booking appointment 1.0
|
3 years ago |
|
Sikander Saleem
|
970887b0c5
|
changes
|
3 years ago |
|
Sikander Saleem
|
71f888ea9b
|
improvements
|
3 years ago |
|
Sikander Saleem
|
51c398e84a
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
e9db30d3da
|
otp clear when wrong code entered.
|
3 years ago |
|
Mirza.Shafique
|
ca3495d71c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
0a83cf8241
|
Bug Fixis
|
3 years ago |
|
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
3 years ago |
|
haroon amjad
|
3f29bbd6b3
|
Updates & fixes
|
3 years ago |
Elham Rababh
|
13737548bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
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 |
|
Sikander Saleem
|
047941fffc
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
5647ab75e5
|
improvements.
|
3 years ago |
|
Mirza.Shafique
|
b2bba050e8
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
|
3 years ago |
|
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
3 years ago |
|
Mirza.Shafique
|
8c8a9c7ce2
|
Medical Perscription 1.0
|
3 years ago |
|
Sikander Saleem
|
ec6693c55e
|
improvement.
|
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 |
|
Elham Rababh
|
f85c359cf4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
Conflicts:
lib/pages/landing/landing_page.dart
|
3 years ago |
|
Elham Rababh
|
69df61afb1
|
remove footer from pharmacy pages
|
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
|
74d0826342
|
fixed issues
|
3 years ago |
|
Sikander Saleem
|
6ee56cba0d
|
Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/new_design/doctor_header.dart
|
3 years ago |
|
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
3 years ago |
|
Mirza.Shafique
|
66efbc1bac
|
Radiology Implementation
|
3 years ago |
|
Mirza.Shafique
|
26c30038c9
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
29fd552874
|
Weight, height and blood pressure on Home Page
|
3 years ago |
|
Sikander Saleem
|
3a1af590ff
|
lab result detail screen (cont.)
|
3 years ago |
|
Elham Rababh
|
8626b4f269
|
first step from add footer for all pages
|
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 |
|
Mirza.Shafique
|
a699740897
|
Medical File Fonts Implementation
|
3 years ago |
|
Mirza.Shafique
|
5f44dece71
|
Ganaric Font and font implementaion
|
3 years ago |
|
Fatimah Alshammari
|
bbb8e04066
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Sikander Saleem
|
ff55ae1908
|
improvements
|
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 |
|
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
|
10a147860c
|
no message
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
3 years ago |
|
Fatimah Alshammari
|
b8ba80b361
|
Merge branch 'fatima-new' into development
|
3 years ago |
|
Fatimah Alshammari
|
39ba2cfde7
|
fixed issues.
|
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
|
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
|
e9e3b079b3
|
Medical Profile Complete 1.1
|
3 years ago |
Sultan Khan
|
e5fb16ad69
|
langauge issue
|
3 years ago |
|
Mirza.Shafique
|
bbaeec5b85
|
Medical Profile Complete
|
3 years ago |
|
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
3 years ago |
|
Sikander Saleem
|
889ae24f07
|
merge changes-3
|
3 years ago |
|
Sikander Saleem
|
c07a8f54c7
|
merge changes-2
|
3 years ago |
|
Sikander Saleem
|
14561d0ac6
|
merge changes-1
|
3 years ago |
|
Sultan Khan
|
7c398ba40d
|
bug fix
|
3 years ago |
|
Mirza.Shafique
|
a20185b2b9
|
Home page 1.4 (Homepage changes)
|
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 |
|
Sikander Saleem
|
53e4815866
|
no auth ui modifications
|
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
|
d6fd03b571
|
CONFIG
|
3 years ago |
|
Sikander Saleem
|
907d90b987
|
login ui and forgot password ui added.
|
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 |
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
|
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 |
|
Sultan Khan
|
14ef096c32
|
changes and fixes
|
3 years ago |
|
Mirza.Shafique
|
b31813770e
|
Check-In NFC done
|
3 years ago |
|
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
3 years ago |
|
Sultan khan
|
f048f5229b
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!321
|
3 years ago |
|
Sultan khan
|
924f9bedc0
|
Merge branch 'bug_fixing' into 'development'
Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!319
|
3 years ago |
|
Sultan khan
|
10f8ee5e81
|
Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881
See merge request Cloud_Solution/diplomatic-quarter!320
|
3 years ago |
|
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
3 years ago |
|
Sultan Khan
|
b4a7235fc8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sikander Saleem
|
d0c8c4f017
|
Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen.
|
3 years ago |
|
Sikander Saleem
|
d6566d4abf
|
PAP-678 fixed, month & days in axis are aligned now.
|
3 years ago |
|
Sikander Saleem
|
7771b8f320
|
PAP-886 fixed, Insurance image button added.
|
3 years ago |
|
Sikander Saleem
|
db84090694
|
PAP-872 & PAP-593 fixed, Water addition was not visible.
|
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
|
bd451f1283
|
Merge branch 'Apr-fixes' into 'development'
Apr fixes
See merge request Cloud_Solution/diplomatic-quarter!310
|
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 |
|
Elham Rababah
|
9588b134fb
|
PAP-645: resized calculator
|
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 |
|
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 |
|
Mohammad Aljammal
|
dcc98a35ac
|
Merge branch 'fix_advance_payment' into 'development'
fix advance payment
See merge request Cloud_Solution/diplomatic-quarter!299
|
4 years ago |
Mohammad Aljammal
|
9a850d0ca3
|
fix advance payment
|
4 years ago |
|
haroon amjad
|
a6a9a92c6f
|
JIRA bug fixes
|
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 |
|
Mohammad Aljammal
|
008a39f043
|
Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!297
|
4 years ago |
|
Sultan Khan
|
8e255f1f22
|
bug fix
|
4 years ago |
|
Sultan Khan
|
d4c3b03a5f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
1b770420be
|
bug fixes
|
4 years ago |
|
Elham Rababah
|
fa23c607bd
|
Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar
|
4 years ago |
|
Elham Rababah
|
7bdf31000f
|
PAP-356: fix chart design
|
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
|
6f2c947687
|
Packages And offers..
|
4 years ago |
|
Sultan Khan
|
9bfd725e4f
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
35c940a209
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
80d96ba785
|
Privilege issue fixed
|
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
|
db0fcd51cc
|
pharmacy updates
|
4 years ago |
|
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
4 years ago |
|
Mohammad Aljammal
|
cacb6722b9
|
Merge branch 'pharmacy-bugs' into 'development'
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
|
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 |
hussam al-habibeh
|
2723422bbf
|
daynimic listing
|
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 |
|
Mohammad Aljammal
|
576181a72e
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!251
|
4 years ago |
|
Sultan Khan
|
6f68cf5a15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Fatimah Alshammari
|
a46dddea9a
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
|
mosazaid
|
dfeb70c892
|
Merge branch 'development' into pharmacy-payment-feature
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
|
4 years ago |
|
mosazaid
|
0b2002d4dd
|
finish payment order
|
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 |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
4 years ago |
enadhilal
|
0cb493d56c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |
|
enadhilal
|
0c6fb67718
|
fixed issues
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
63663f1b24
|
Track Delivery Driver Completed
|
4 years ago |
|
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
4 years ago |
|
Sultan Khan
|
144ef52c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |