Commit Graph

924 Commits (f303235ddde15877407af2b985b90e29ab10a104)
 

Author SHA1 Message Date
Sultan Khan 4b5ac8c853 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan f05b235cd0 login issue 4 years ago
haroon amjad 2e484d7535 QR Code loading issue resolved 4 years ago
Zohaib Kambrani 0c71fbad5f no message 4 years ago
Mohammad Aljammal 75c8950498 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!106
4 years ago
Sultan Khan cced69502a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal 2d7923afb4 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!105
4 years ago
haroon amjad 6062716209 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 10efccbce8 my appointment fixes 4 years ago
Sultan Khan aec2ab75d0 settings update 4 years ago
Sultan Khan aa8f9f18e1 forgot password 4 years ago
Fatimah Alshammari ddf032bb47 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Fatimah Alshammari f137bd44c0 created order and order details UI pages 4 years ago
Mohammad Aljammal 0222b484b7 Merge branch 'my_family' into 'diplomatic-quarter-live'
My family

See merge request Cloud_Solution/diplomatic-quarter!104
4 years ago
Mohammad Aljmma 981020fce5 fix my family issues 4 years ago
Mohammad Aljmma 1111f26a9d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family 4 years ago
haroon amjad 94fb41581e config update 4 years ago
haroon amjad 9868a43e7b Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
4 years ago
haroon amjad 506e32e8c8 Payment issues resolved 4 years ago
haroon amjad 05ad8f8db5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Sultan Khan 4976870d2e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 875bf10c73 settings page added 4 years ago
Mohammad Aljammal de3b76446a Merge branch 'info_medical' into 'diplomatic-quarter-live'
add info for Medical

See merge request Cloud_Solution/diplomatic-quarter!103
4 years ago
Mohammad Aljmma 6a83538544 add info for Medical 4 years ago
Mohammad Aljammal 620f824b0a Merge branch 'fix_authentication' into 'diplomatic-quarter-live'
fix user authentication data

See merge request Cloud_Solution/diplomatic-quarter!102
4 years ago
Mohammad Aljmma a077d87dd8 fix user authentication data 4 years ago
haroon amjad ffbc7c4af4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljammal 332820885e Merge branch 'fix_authentication' into 'diplomatic-quarter-live'
Fix authentication

See merge request Cloud_Solution/diplomatic-quarter!101
4 years ago
Mohammad Aljmma 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 4 years ago
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
hussam al-habibeh 6162833bba offers products page 4 years ago
hussam al-habibeh 7815005e21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago