Commit Graph

1137 Commits (b70c7d7d053d2d8970ce35be442f05be6f3b0b7a)
 

Author SHA1 Message Date
Mohammad Aljammal b326b0324e Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!211
4 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan d53031b0e6 blood type update for family files 4 years ago
Mohammad Aljammal bffafa65d1 Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!210
4 years ago
Mohammad Aljammal b9958acd53 fix issues 4 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 4 years ago
Mohammad Aljammal 2d9ade7a5e Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!209
4 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 4 years ago
Mohammad Aljammal 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal f6983c138a fix issues 4 years ago
Mohammad Aljammal f850678fb6 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!208
4 years ago
Sultan Khan 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan b505ed1be7 blood type added 4 years ago
Zohaib Kambrani 3392a2431b Added Location Provider Changed Receiver to Reregister the geofences 4 years ago
Zohaib Kambrani 187d2bcd8b Geofence error logging in shared_preferences 4 years ago
Zohaib Kambrani a11d93332d Wifi check network available - android
tweaking at geofence code
4 years ago
Mohammad Aljammal 7cd8e1ff40 Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!207
4 years ago
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal adfeabb411 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!205
4 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 4 years ago
Fatimah Alshammari e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
#	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari fda101840a fixed order isuues 4 years ago
Zohaib Kambrani 4c00f9b3f2 Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani
* 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  geofencing login check fix
4 years ago
Zohaib Kambrani 7b4a2b9e64 no message 4 years ago
Zohaib Kambrani 508bc191be geofencing login check fix 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
Zohaib Kambrani d8bd7d145d no message 4 years ago
Mohammad Aljammal aa0d6e206e Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!204
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 d555634e28 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!203
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
Mohammad Aljammal 51f7833f50 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!202
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 f303235ddd Merge branch 'merge_dq_and_master' into 'master'
Merge dq and master

See merge request Cloud_Solution/diplomatic-quarter!200
4 years ago
Mohammad Aljammal 7bc8fdb819 fix merge issues 4 years ago
Mohammad Aljammal 3c2af11084 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal f87bcfe064 Merge branch 'ZohaibIqbalKambrani' into 'master'
Geofence Android Finished

See merge request Cloud_Solution/diplomatic-quarter!201
4 years ago
Zohaib Kambrani d8996cf879 Geofence Android Finished 4 years ago
Mohammad Aljammal d28870a629 fix merge issues 4 years ago
Mohammad Aljammal 6d7cb1b970 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	lib/core/service/AuthenticatedUserObject.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal a45216b902 hot fixes 4 years ago
Mohammad Aljammal f13d21c5b1 Merge branch 'ZohaibIqbalKambrani' into 'master'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!198
4 years ago
Mohammad Aljammal a57d5eb69f hot fixes 4 years ago
mosazaid 0237d71931 make firebase-in app messaging commented to solve problem Duplicate class com.google.protobuf.WireFormat$Utf8Validation$3 found in modules jetified-protobuf-javalite-3.11.0.jar (com.google.protobuf:protobuf-javalite:3.11.0) and jetified-protobuf-lite-3.0.1.jar (com.google.protobuf:protobuf-lite:3.0.1) 4 years ago
Zohaib Kambrani 0f64c45e67 no message 4 years ago