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
|
5 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
|
5 years ago |
haroon amjad
|
15a8e64e7c
|
updates & fixes
|
5 years ago |
Elham Rababah
|
41b919183f
|
Fix bug on read notifications_page.dart
|
5 years ago |
Mohammad Aljammal
|
6d30156f1a
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!98
|
5 years ago |
Mohammad Aljmma
|
9880b0236b
|
fix my family issues
|
5 years ago |
Sultan Khan
|
0443a37886
|
register page updated
|
5 years ago |
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
5 years ago |
haroon amjad
|
89022231d7
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
5 years ago |
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
f8e05fc447
|
regiter issue
|
5 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
|
5 years ago |
Mohammad Aljmma
|
747cffacfc
|
fix lab result
|
5 years ago |
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
5 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
|
5 years ago |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
5 years ago |
haroon amjad
|
ff3368eefb
|
Login check implemented for appointment & ToDo
|
5 years ago |
Mohammad Aljammal
|
55e25fade8
|
Merge branch 'fix_login' into 'diplomatic-quarter-live'
Fix login
See merge request Cloud_Solution/diplomatic-quarter!94
|
5 years ago |
Mohammad Aljmma
|
54a7f98eff
|
fix login issues
|
5 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
|
5 years ago |
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
5 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
|
5 years ago |
haroon amjad
|
af780bca76
|
registration fixes
|
5 years ago |
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
5 years ago |
Mohammad Aljammal
|
8fe17a5cad
|
Merge branch 'home_page' into 'diplomatic-quarter-live'
Home page
See merge request Cloud_Solution/diplomatic-quarter!91
|
5 years ago |
Mohammad Aljmma
|
59d592778b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
|
5 years ago |
Mohammad Aljmma
|
e7e32a414b
|
fix barcode
|
5 years ago |
Mohammad Aljammal
|
1775766a08
|
Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.
See merge request Cloud_Solution/diplomatic-quarter!90
|
5 years ago |
Elham Rababah
|
fa88e9055f
|
make loader center
|
5 years ago |
Elham Rababah
|
042de21831
|
Fix loader issue.
|
5 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
|
5 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
|
5 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
|
5 years ago |
Mohammad Aljammal
|
ffe85305b5
|
Merge branch 'home_page' into 'diplomatic-quarter-live'
Home page
See merge request Cloud_Solution/diplomatic-quarter!88
|
5 years ago |
Mohammad Aljmma
|
479aea4df8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
5 years ago |
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
5 years ago |
Mohammad Aljammal
|
0e11133ef1
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
New loading dialog added into appointment flow
See merge request Cloud_Solution/diplomatic-quarter!87
|
5 years ago |
haroon amjad
|
1553e71e7d
|
New loading dialog added into appointment flow
|
5 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
|
5 years ago |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
5 years ago |
Mohammad Aljammal
|
f8d148c849
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
updates
See merge request Cloud_Solution/diplomatic-quarter!86
|
5 years ago |
haroon amjad
|
6fd7a3fa3d
|
updates
|
5 years ago |
Mohammad Aljammal
|
dd361cd883
|
Merge branch 'home_page' into 'diplomatic-quarter-live'
Home page
See merge request Cloud_Solution/diplomatic-quarter!85
|
5 years ago |
Mohammad Aljmma
|
89cfcd3cad
|
fix design issues
|
5 years ago |
Mohammad Aljmma
|
0b90d3c687
|
fix issues
|
5 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
|
5 years ago |
Mohammad Aljmma
|
0b309ebba3
|
change the home page design
|
5 years ago |