Commit Graph

79 Commits (ccd2fc5068c2abc20f233fd38d83ae03a85ef9a1)

Author SHA1 Message Date
Sultan Khan 68f7a9ff9c login chnages 4 years ago
Sultan Khan c65983bfdb code merged 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
Mohammad Aljammal 7f23f356f1 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!151
4 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
Sultan Khan e34a5c3c13 multiple login calls fixed 4 years ago
Sultan Khan f5b7d35f23 bug fixes 4 years ago
Sultan Khan 79c17de0de ltr issue fixed 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 8429f83d7c registration done 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 bedafa24cd insurance details 4 years ago
Sultan Khan a16145d7f1 bugfixes 4 years ago
Sultan Khan 0eedb788c3 register page 4 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 4 years ago
Sultan Khan 58b1f648c1 setting theme 4 years ago
Sultan Khan f05b235cd0 login issue 4 years ago
Sultan Khan cced69502a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan aa8f9f18e1 forgot password 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
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 Aljmma 570aa514cd fix user authentication data 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 Aljmma 4a4d5248a2 fix status 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 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
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
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 e42f953bd1 fix prescription report issues 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
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
haroon amjad 6a630f6d33 logo & colors changed for login & registration flow 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 53bbafdc2b fix Authenticated User Object 4 years ago