Commit Graph

200 Commits (97a8fe4f9b9ed950bed817b6c5b21f1317e10104)

Author SHA1 Message Date
Mohammad Aljmma 0f938fafd2 fix issue #12 4 years ago
Mohammad Aljmma 179df475b4 fix issue #9 4 years ago
Mohammad Aljmma b913e5a7b7 fix issue#6 4 years ago
Mohammad Aljmma 27594f15b8 fix issue#1 4 years ago
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 4 years ago
Sultan Khan cced69502a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 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 Aljmma 6a83538544 add info for Medical 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 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 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
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
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
Elham Rababah 9f2beceb22 First step from notifications_page 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 dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 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
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
haroon amjad f5a2870fac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
4 years ago
Mohammad Aljmma d4be20b07b add icons 4 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 4 years ago
Mohammad Aljmma d5afb50ed3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljmma 856ab52439 fix ui issues 4 years ago
haroon amjad 6fd7a3fa3d updates 4 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 4 years ago
Mohammad Aljmma 0b90d3c687 fix issues 4 years ago
Mohammad Aljmma 894494ec4e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	ios/Flutter/.last_build_id
	lib/main.dart
	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljmma 874de15040 change the home page design 4 years ago
Mohammad Aljammal 94c25d2188 Merge branch 'loader' into 'diplomatic-quarter-live'
Loader

See merge request Cloud_Solution/diplomatic-quarter!84
4 years ago
Elham Rababah 6f5b5ed0c2 move gif loader utils 4 years ago
Elham Rababah bf412e1edf Finish loader as Gif image in all cases where the network is busy 4 years ago
haroon amjad d5118bda11 Login / Register UI fixes 4 years ago
Elham Rababah cd7c354458 loader first step 4 years ago
haroon amjad 3354058738 Branding updated according to DQ 4 years ago
haroon amjad 3ae6df1dcb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live 4 years ago