Commit Graph

62 Commits (f1c2dbbbfc7bdcabe538c725c09dd82821f670c6)

Author SHA1 Message Date
haroon amjad 44d59ed01a updates & fixes 3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Sultan Khan cd7845b1a4 bug fix 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Mohammad Aljammal ab53ca82b1 fix colors issues 4 years ago
Sultan Khan 68f7a9ff9c login chnages 4 years ago
Sultan Khan c65983bfdb code merged 4 years ago
Mohammad Aljammal 952e106531 return privilege 4 years ago
Mohammad Aljammal 6bda03e935 hot fixing 4 years ago
Sultan Khan e6a94f8014 login design 4 years ago
Sultan Khan b992978af4 login 4 years ago
Sultan Khan 764e706000 dashboard issue fixed 4 years ago
Sultan Khan c01246acf0 hot fix 4 years ago
Sultan Khan a0baaac314 bug fixes 4 years ago
Sultan Khan 040c8f38ab hot fixes 4 years ago
Sultan Khan b759758a68 bug fixes 4 years ago
Sultan Khan 9e3db622fa login loader issue fixed 4 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 9dfd8a71dc Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
 Conflicts:
	lib/locator.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/login/confirm-login.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/widgets/bottom_navigation/bottom_nav_bar.dart
	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Sultan Khan e34a5c3c13 multiple login calls fixed 4 years ago
Sultan Khan f5b7d35f23 bug fixes 4 years ago
Mohammad Aljammal dc898a799d Add Privileges 4 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Sultan Khan d6a0188c76 fingerprint 4 years ago
Sultan Khan 6a14214a0f no message 4 years ago
Sultan Khan 8d499704dc family file changes 4 years ago
Sultan Khan 2f454055b9 login fixed 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad b89c1f03b3 language translation fixes 4 years ago
Sultan Khan f05b235cd0 login issue 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
haroon amjad 15a8e64e7c updates & fixes 4 years ago
Sultan Khan b9b5797cbc login issue fixed 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 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
haroon amjad af780bca76 registration fixes 4 years ago
haroon amjad dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 4 years ago
haroon amjad d5118bda11 Login / Register UI fixes 4 years ago
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 4 years ago
Sultan Khan 8f18d1025a voice search 4 years ago
Sultan Khan 227731f8f8 Merge 4 years ago