Commit Graph

749 Commits (c0920e709900dcf3825672d4b4e4a46be006dafc)
 

Author SHA1 Message Date
Mohammad Aljammal f70ca95a38 fix merge issues 4 years ago
Mohammad Aljammal 85df92a0ca Merge branch 'fix_master' into 'master'
Fix master

See merge request Cloud_Solution/diplomatic-quarter!119
4 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal eb5727ef8a fix master 4 years ago
Mohammad Aljammal 776b20ff67 fix master 4 years ago
Mohammad Aljammal 939840bbe7 fix master 4 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 4 years ago
Mohammad Aljammal 221091c5f0 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!118
4 years ago
Sultan Khan 072e6cffef Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 2f454055b9 login fixed 4 years ago
Mohammad Aljammal b7b740cccf Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!117
4 years ago
Sultan Khan 18a2393d92 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 6e152951b4 notification count 4 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
Mohammad Aljammal 748d98610f Merge branch 'fix_medicine_search' into 'diplomatic-quarter-live'
Fix medicine search

See merge request Cloud_Solution/diplomatic-quarter!113
4 years ago
Sultan Khan d2f391ab7f setting page inprogress 4 years ago
Sultan Khan 4c8c4e3725 setting page inprogress 4 years ago
Sultan Khan 0ed29be214 launch 4 years ago
Sultan Khan 00b0154987 my family 4 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 4 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 4 years ago
Mohammad Aljammal e4cd33921d Merge branch 'arabic_issues' into 'diplomatic-quarter-live'
lab result issues

See merge request Cloud_Solution/diplomatic-quarter!112
4 years ago
Mohammad Aljmma 6523a1dea9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Mohammad Aljmma 501692587f change the base Url 4 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 4 years ago
Sultan Khan fdef34a394 viral sign issue 4 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 4 years ago
Mohammad Aljmma ed7b9d609f fix lab result 4 years ago
Mohammad Aljammal f6d2246e90 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!111
4 years ago
haroon amjad b81af62551 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad b89c1f03b3 language translation fixes 4 years ago
Sultan Khan 431306f0e1 insurance details 4 years ago
Sultan Khan 1f4f81b454 insurance card details 4 years ago
Sultan Khan bedafa24cd insurance details 4 years ago
Sultan Khan d81cc7119d insurance details 4 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 4 years ago
Sultan Khan a16145d7f1 bugfixes 4 years ago
Sultan Khan 0eedb788c3 register page 4 years ago
Sultan Khan 536682e953 merge 4 years ago
Sultan Khan 1eb6516ea6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 4 years ago
Mohammad Aljammal e4f768454d Merge branch 'arabic_issues' into 'diplomatic-quarter-live'
Arabic issues

See merge request Cloud_Solution/diplomatic-quarter!110
4 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 4 years ago
Mohammad Aljmma e42ebfbf64 fix issue #16 4 years ago
Mohammad Aljmma 59defa4532 fix issue #15 4 years ago
Mohammad Aljmma 97a8fe4f9b fix issue #14 4 years ago