Commit Graph

  • 6ffaa85864 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-30 10:40:05 +0000
  • c48415ad47 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-30 10:39:43 +0000
  • 4263672f00 fim last vital sign data Mohammad Aljammal 2020-12-30 12:38:31 +0200
  • 80da19555c Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-29 14:59:24 +0000
  • 3132d8a6ba Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-29 14:59:20 +0000
  • 519a474d41 fix live care label and vital sign data Mohammad Aljammal 2020-12-29 16:50:18 +0200
  • c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima Fatimah Alshammari 2020-12-29 15:11:58 +0300
  • 5fa5e9b7c8 fixed orders and profile Fatimah Alshammari 2020-12-29 11:47:52 +0300
  • 5e3f6363cf fix issues Mohammad Aljammal 2020-12-28 18:04:23 +0200
  • 85a8bdf55b Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-28 11:43:48 +0000
  • 754e60eb72 fix send email lab result Mohammad Aljammal 2020-12-28 13:16:59 +0200
  • d7764cf3d0 Merge branch 'sultan' into 'diplomatic-quarter-live' Sultan khan 2020-12-28 09:52:47 +0000
  • 6b4bae7370 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-28 12:51:10 +0300
  • 827768e96d language change Sultan Khan 2020-12-28 12:50:05 +0300
  • eb459010a9 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-27 15:18:48 +0000
  • 0e8566e0e3 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-27 15:18:43 +0000
  • 591d56e624 change the info images and change the out patient color Mohammad Aljammal 2020-12-27 17:17:09 +0200
  • f03adb37ce no message Zohaib Kambrani 2020-12-27 14:27:54 +0300
  • 5c8e43c163 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes Mohammad Aljammal 2020-12-27 10:47:03 +0200
  • 2553b032dd Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-27 08:46:21 +0000
  • 87dc5ce027 Merge branch 'sultan' into 'diplomatic-quarter-live' Sultan khan 2020-12-27 07:04:21 +0000
  • 8becd4f920 login issue fixed Sultan Khan 2020-12-27 09:59:53 +0300
  • 3edae19ad6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-25 04:42:45 +0300
  • c9538c6a84 family files Sultan Khan 2020-12-25 04:42:31 +0300
  • 57925e3b02 Geofence fixes by JobScheduler Zohaib Kambrani 2020-12-24 18:01:32 +0300
  • 33c61afd2a add powered by Mohammad Aljammal 2020-12-24 14:26:03 +0200
  • 4204abdddc Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-24 12:15:07 +0000
  • 5e29dff448 fix issues insurance and medical profile order Mohammad Aljammal 2020-12-24 14:14:30 +0200
  • 50b5886b9f Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-24 08:57:42 +0000
  • 355286768a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-24 09:21:31 +0300
  • 73c8e00852 bug fixes Sultan Khan 2020-12-24 09:20:40 +0300
  • 493c62cd99 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-24 00:47:29 +0000
  • b0ea1fc262 updates & fixes Haroon Amjad 2020-12-24 05:40:25 +0500
  • b326b0324e Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-23 08:48:23 +0000
  • 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-23 10:02:48 +0300
  • d53031b0e6 blood type update for family files Sultan Khan 2020-12-23 10:02:04 +0300
  • bffafa65d1 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-22 22:49:01 +0000
  • b9958acd53 fix issues Mohammad Aljammal 2020-12-23 00:33:15 +0200
  • 2059b76fc1 fix Medical profile Mohammad Aljammal 2020-12-23 00:00:23 +0200
  • 2d9ade7a5e Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-22 13:12:08 +0000
  • 4d8f42b517 fix issues vital sign issue Mohammad Aljammal 2020-12-22 14:25:41 +0200
  • 4f015a1cda Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes Mohammad Aljammal 2020-12-22 13:33:24 +0200
  • f6983c138a fix issues Mohammad Aljammal 2020-12-22 13:33:01 +0200
  • f850678fb6 Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-22 09:07:19 +0000
  • 37ab778fd0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-22 09:17:07 +0300
  • b505ed1be7 blood type added Sultan Khan 2020-12-22 09:16:57 +0300
  • 3392a2431b Added Location Provider Changed Receiver to Reregister the geofences Zohaib Kambrani 2020-12-21 18:42:50 +0300
  • 187d2bcd8b Geofence error logging in shared_preferences Zohaib Kambrani 2020-12-21 18:01:13 +0300
  • a11d93332d Wifi check network available - android tweaking at geofence code Zohaib Kambrani 2020-12-21 17:19:40 +0300
  • 7cd8e1ff40 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-21 13:03:59 +0000
  • 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes Mohammad Aljammal 2020-12-21 15:03:15 +0200
  • adfeabb411 Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-21 13:02:45 +0000
  • 9c12e949e8 hot fixes Mohammad Aljammal 2020-12-21 15:02:05 +0200
  • e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima Fatimah Alshammari 2020-12-21 11:22:53 +0300
  • fda101840a fixed order isuues Fatimah Alshammari 2020-12-21 10:17:17 +0300
  • 4c00f9b3f2 Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani Zohaib Kambrani 2020-12-20 14:18:09 +0300
  • 7b4a2b9e64 no message Zohaib Kambrani 2020-12-20 14:18:03 +0300
  • 508bc191be geofencing login check fix Zohaib Kambrani 2020-12-20 13:44:29 +0300
  • 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-19 13:18:37 +0300
  • a0baaac314 bug fixes Sultan Khan 2020-12-19 13:18:23 +0300
  • d8bd7d145d no message Zohaib Kambrani 2020-12-17 18:30:04 +0300
  • aa0d6e206e Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-17 15:14:59 +0000
  • a8b0af9ee1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes Mohammad Aljammal 2020-12-17 17:14:19 +0200
  • d555634e28 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-17 15:13:36 +0000
  • 9c18c69d90 hot fixes Mohammad Aljammal 2020-12-17 17:13:13 +0200
  • 53282e3ae6 ToDo back issue fixed haroon amjad 2020-12-17 17:52:19 +0300
  • ac3bebd59e Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon haroon amjad 2020-12-17 17:41:03 +0300
  • 8c9762c24f Fixes haroon amjad 2020-12-17 17:40:35 +0300
  • 51f7833f50 Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-17 10:52:24 +0000
  • 073e79c325 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-17 13:10:10 +0300
  • 040c8f38ab hot fixes Sultan Khan 2020-12-17 13:09:58 +0300
  • f303235ddd Merge branch 'merge_dq_and_master' into 'master' Mohammad Aljammal 2020-12-17 09:52:05 +0000
  • 7bc8fdb819 fix merge issues Mohammad Aljammal 2020-12-17 11:51:02 +0200
  • 3c2af11084 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master Mohammad Aljammal 2020-12-17 11:47:50 +0200
  • f87bcfe064 Merge branch 'ZohaibIqbalKambrani' into 'master' Mohammad Aljammal 2020-12-17 09:44:50 +0000
  • d8996cf879 Geofence Android Finished Zohaib Kambrani 2020-12-17 12:38:59 +0300
  • d28870a629 fix merge issues Mohammad Aljammal 2020-12-17 11:26:04 +0200
  • 6d7cb1b970 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master Mohammad Aljammal 2020-12-17 11:06:39 +0200
  • a45216b902 hot fixes Mohammad Aljammal 2020-12-17 10:55:12 +0200
  • f13d21c5b1 Merge branch 'ZohaibIqbalKambrani' into 'master' Mohammad Aljammal 2020-12-17 08:49:04 +0000
  • a57d5eb69f hot fixes Mohammad Aljammal 2020-12-17 10:47:51 +0200
  • 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) mosazaid 2020-12-17 09:37:30 +0200
  • 0f64c45e67 no message Zohaib Kambrani 2020-12-17 09:05:38 +0300
  • d9a70e7f75 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 17:22:21 +0000
  • 8329c534a3 hot fixes Mohammad Aljammal 2020-12-16 19:10:34 +0200
  • 4e2979cd64 fix merge issues Mohammad Aljammal 2020-12-16 19:03:34 +0200
  • 7167d58ce2 fix merge issues Mohammad Aljammal 2020-12-16 19:02:43 +0200
  • aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter Mohammad Aljammal 2020-12-16 18:25:04 +0200
  • 359eba2da0 make some updates in firebase version and update gradle, finish review order mosazaid 2020-12-16 18:10:38 +0200
  • 1dc9400ffc Geofencing work in progress on android Zohaib Kambrani 2020-12-16 17:50:25 +0300
  • 9b67b2632b Merge branch 'sultan' into 'diplomatic-quarter-live' dq_and_master Mohammad Aljammal 2020-12-16 14:23:01 +0000
  • e312671e24 hot fixes Sultan Khan 2020-12-16 17:17:23 +0300
  • cf642da661 landing page Sultan Khan 2020-12-16 17:09:00 +0300
  • d8134240de Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 13:47:22 +0000
  • eec67ac930 big fixes Sultan Khan 2020-12-16 16:38:56 +0300
  • 99ee5b4545 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-16 16:26:11 +0300
  • ca1e496481 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 13:22:41 +0000
  • b29fdbb7d0 fix home issues Mohammad Aljammal 2020-12-16 15:21:44 +0200
  • 8a554aa2f8 auth services fixed Sultan Khan 2020-12-16 16:08:41 +0300
  • 530c9e89fc Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 11:52:40 +0000