Commit Graph

650 Commits (09a85d912784eaff12812d9c82157ac1fe33eef5)

Author SHA1 Message Date
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Sultan Khan 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan a0baaac314 bug fixes 4 years ago
Mohammad Aljammal a8b0af9ee1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 4 years ago
haroon amjad 53282e3ae6 ToDo back issue fixed 4 years ago
haroon amjad ac3bebd59e Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 8c9762c24f Fixes 4 years ago
Sultan Khan 073e79c325 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 040c8f38ab hot fixes 4 years ago
Mohammad Aljammal d9a70e7f75 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
hot fixes

See merge request Cloud_Solution/diplomatic-quarter!199
4 years ago
Mohammad Aljammal 8329c534a3 hot fixes 4 years ago
Sultan Khan e312671e24 hot fixes 4 years ago
Sultan Khan cf642da661 landing page 4 years ago
Sultan Khan eec67ac930 big fixes 4 years ago
Sultan Khan 99ee5b4545 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 4 years ago
Sultan Khan 8a554aa2f8 auth services fixed 4 years ago
Mohammad Aljammal d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/login/login.dart
4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Sultan Khan 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 9a578cafc2 bug fixes 4 years ago
Sultan Khan b759758a68 bug fixes 4 years ago
Mohammad Aljammal 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues

See merge request Cloud_Solution/diplomatic-quarter!188
4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Haroon Amjad 3308aa47e1 fixes 4 years ago
Sultan Khan 9e3db622fa login loader issue fixed 4 years ago
Mohammad Aljammal 3122f2438b fix import dialog 4 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 4 years ago
haroon amjad 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad bf999e611b my appointment fix 4 years ago
Sultan Khan d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan a2e385f282 family file drawer 4 years ago
Haroon Amjad b9269f525a hot fixes 4 years ago
Haroon Amjad c67d41701d Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Haroon Amjad 5606c88715 hot fixes 4 years ago
Mohammad Aljammal 92e6275162 Add Confirm send email dialog 4 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 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 4a43bcefe1 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
remove ErOptions

See merge request Cloud_Solution/diplomatic-quarter!179
4 years ago
Mohammad Aljammal a6d3fce6fc remove ErOptions 4 years ago
haroon amjad b13a56ffbd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 951d9b553f fixes & updates 4 years ago
Sultan Khan 71592adf32 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago