Commit Graph

2906 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)
 

Author SHA1 Message Date
Sultan Khan 8a554aa2f8 auth services fixed 5 years ago
Mohammad Aljammal 530c9e89fc Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!191
5 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
5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
Mohammad Aljammal 2a2d149cc6 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!189
5 years ago
Sultan Khan 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 466b17949a Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!190
5 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 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
5 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9a578cafc2 bug fixes 5 years ago
Sultan Khan b759758a68 bug fixes 5 years ago
Mohammad Aljammal 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues

See merge request Cloud_Solution/diplomatic-quarter!188
5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Haroon Amjad 3308aa47e1 fixes 5 years ago
Mohammad Aljammal 1c2f08a9fe Merge branch 'sultan' into 'diplomatic-quarter-live'
login loader issue fixed

See merge request Cloud_Solution/diplomatic-quarter!186
5 years ago
Sultan Khan 9e3db622fa login loader issue fixed 5 years ago
Zohaib Kambrani 78928335ef Geofences Login check (unregister/register geozones on logout/logout) 5 years ago
Zohaib Kambrani 6f6ab8d987 no message 5 years ago
Mohammad Aljammal d5c5b7eaed Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!185
5 years ago
Mohammad Aljammal 3122f2438b fix import dialog 5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Mohammad Aljammal 82724883fb Merge branch 'ZohaibIqbalKambrani' into 'master'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!183
5 years ago
Mohammad Aljammal fc00361db1 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!184
5 years ago
Zohaib Kambrani 53775d113d commented code offers and packages 5 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 5 years ago
Zohaib Kambrani c534061c4f no message 5 years ago
Zohaib Kambrani 9ea779e48a no message 5 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 5 years ago
haroon amjad 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad bf999e611b my appointment fix 5 years ago
Mohammad Aljammal 7345a289ed Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!182
5 years ago
Sultan Khan d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a2e385f282 family file drawer 5 years ago
Haroon Amjad b9269f525a hot fixes 5 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
5 years ago
Haroon Amjad 5606c88715 hot fixes 5 years ago
Mohammad Aljammal 621abe3ca2 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Add Confirm send email dialog

See merge request Cloud_Solution/diplomatic-quarter!181
5 years ago
Mohammad Aljammal 92e6275162 Add Confirm send email dialog 5 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal e35f706be3 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix chart and duplicated data in Patient Lab Result

See merge request Cloud_Solution/diplomatic-quarter!180
5 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 5 years ago
Mohammad Aljammal 4a43bcefe1 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
remove ErOptions

See merge request Cloud_Solution/diplomatic-quarter!179
5 years ago
Mohammad Aljammal a6d3fce6fc remove ErOptions 5 years ago
Zohaib Kambrani 8457972fda no message 5 years ago
haroon amjad b13a56ffbd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago