Commit Graph

679 Commits (1155466d1983b2562928806dbd5d3cf1401f358c)
 

Author SHA1 Message Date
Mohammad Aljmma 570aa514cd fix user authentication data 4 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad ee67852970 Bottom navbar count & ToDo list fixed 4 years ago
haroon amjad f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 398bbe6f8d Merge branch 'notifications_page' into 'diplomatic-quarter-live'
Notifications page

See merge request Cloud_Solution/diplomatic-quarter!99
4 years ago
haroon amjad d75e5caf08 fixed appointment online checkIn issue 4 years ago
Elham Rababah 124d388ee1 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
4 years ago
Mohammad Aljammal 625e40d7bf Merge branch 'hot_login_fixing' into 'diplomatic-quarter-live'
fix status issue

See merge request Cloud_Solution/diplomatic-quarter!100
4 years ago
Mohammad Aljmma 4a4d5248a2 fix status issue 4 years ago
Elham Rababah 64f970c40c Fix issues after the merge 4 years ago
haroon amjad 5020c24e8b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/services/authentication/auth_provider.dart
4 years ago
Elham Rababah 5ed4d76a54 Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 4 years ago
Mohammad Aljammal 6d30156f1a Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!98
4 years ago
Mohammad Aljmma 9880b0236b fix my family issues 4 years ago
Sultan Khan 0443a37886 register page updated 4 years ago
Sultan Khan b9b5797cbc login issue fixed 4 years ago
haroon amjad 89022231d7 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 4 years ago
Sultan Khan d939b2ec9b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan f8e05fc447 regiter issue 4 years ago
Mohammad Aljammal 8baa3bd1a5 Merge branch 'prescription_report_fix' into 'diplomatic-quarter-live'
fix lab result

See merge request Cloud_Solution/diplomatic-quarter!97
4 years ago
Mohammad Aljmma 747cffacfc fix lab result 4 years ago
haroon amjad 4f53d058d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal a691186ec7 Merge branch 'pharmacy_module_feature_home_page' into 'master'
Pharmacy module feature home page

See merge request Cloud_Solution/diplomatic-quarter!96
4 years ago
mosazaid 2095f2c62a fix merge issue 4 years ago
mosazaid dade295656 fix merge issue 4 years ago
mosazaid 11ff27bae3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
4 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 4 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 4 years ago
Mohammad Aljammal f361793f39 Merge branch 'prescription_report_fix' into 'diplomatic-quarter-live'
fix prescription report issues

See merge request Cloud_Solution/diplomatic-quarter!95
4 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 4 years ago
haroon amjad ff3368eefb Login check implemented for appointment & ToDo 4 years ago
Mohammad Aljammal 55e25fade8 Merge branch 'fix_login' into 'diplomatic-quarter-live'
Fix login

See merge request Cloud_Solution/diplomatic-quarter!94
4 years ago
Mohammad Aljmma 54a7f98eff fix login issues 4 years ago
Mohammad Aljmma a796e0392b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
 Conflicts:
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
4 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 4 years ago
Mohammad Aljammal 625025c079 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
fixed forgot password issue, Implemented new loader in login flow

See merge request Cloud_Solution/diplomatic-quarter!93
4 years ago
haroon amjad af780bca76 registration fixes 4 years ago
haroon amjad dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 4 years ago
mosazaid d1ac4080ca working on pharmacy home page 4 years ago
Mohammad Aljammal 8fe17a5cad Merge branch 'home_page' into 'diplomatic-quarter-live'
Home page

See merge request Cloud_Solution/diplomatic-quarter!91
4 years ago
Mohammad Aljmma 59d592778b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page 4 years ago
Mohammad Aljmma e7e32a414b fix barcode 4 years ago
Mohammad Aljammal 1775766a08 Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.

See merge request Cloud_Solution/diplomatic-quarter!90
4 years ago
Elham Rababah fa88e9055f make loader center 4 years ago
Elham Rababah 042de21831 Fix loader issue. 4 years ago
Mohammad Aljammal f3e64eaa6b Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!89
4 years ago
haroon amjad aeab57beab Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/main.dart
#	lib/pages/landing/home_page.dart
4 years ago