Commit Graph

  • 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' 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
  • d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix Mohammad Aljammal 2020-12-16 13:28:21 +0200
  • 02d72fa27c fix issues Mohammad Aljammal 2020-12-16 13:25:39 +0200
  • 4a84483698 fixed order details Fatimah Alshammari 2020-12-16 12:50:41 +0300
  • 2a2d149cc6 Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 09:47:43 +0000
  • 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-16 12:46:20 +0300
  • 466b17949a Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 09:37:36 +0000
  • a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon haroon amjad 2020-12-16 12:29:10 +0300
  • 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon haroon amjad 2020-12-16 12:28:28 +0300
  • 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-16 12:27:13 +0300
  • 9a578cafc2 bug fixes Sultan Khan 2020-12-16 12:21:23 +0300
  • b759758a68 bug fixes Sultan Khan 2020-12-16 12:21:13 +0300
  • 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-16 08:24:25 +0000
  • f38f53587b fix issues Mohammad Aljammal 2020-12-16 01:08:24 +0200
  • 3308aa47e1 fixes Haroon Amjad 2020-12-16 02:07:52 +0300
  • 1c2f08a9fe Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-15 17:30:07 +0000
  • 9e3db622fa login loader issue fixed Sultan Khan 2020-12-15 20:17:44 +0300
  • 78928335ef Geofences Login check (unregister/register geozones on logout/logout) Zohaib Kambrani 2020-12-15 17:59:39 +0300
  • 6f6ab8d987 no message Zohaib Kambrani 2020-12-15 17:46:00 +0300
  • d5c5b7eaed Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-15 13:48:50 +0000
  • 3122f2438b fix import dialog Mohammad Aljammal 2020-12-15 15:47:59 +0200
  • 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix Mohammad Aljammal 2020-12-15 15:45:51 +0200
  • de1e352e98 fix charts and vital sign Mohammad Aljammal 2020-12-15 15:45:30 +0200
  • 82724883fb Merge branch 'ZohaibIqbalKambrani' into 'master' Mohammad Aljammal 2020-12-15 13:34:51 +0000
  • fc00361db1 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-15 13:33:44 +0000
  • 53775d113d commented code offers and packages Zohaib Kambrani 2020-12-15 16:25:50 +0300
  • 9947b30d3f fix merge conflict Zohaib Kambrani 2020-12-15 16:02:36 +0300
  • c534061c4f no message Zohaib Kambrani 2020-12-15 15:46:19 +0300
  • 9ea779e48a no message Zohaib Kambrani 2020-12-15 15:29:32 +0300
  • b7088f70cd Merge master in to my branch with Geofence iOS Zohaib Kambrani 2020-12-15 15:24:39 +0300
  • 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon haroon amjad 2020-12-15 15:16:19 +0300
  • bf999e611b my appointment fix haroon amjad 2020-12-15 14:19:28 +0300
  • 7345a289ed Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-15 09:07:58 +0000
  • d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-15 11:38:04 +0300
  • a2e385f282 family file drawer Sultan Khan 2020-12-15 11:37:51 +0300
  • b9269f525a hot fixes Haroon Amjad 2020-12-14 23:10:30 +0300
  • c67d41701d Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon Haroon Amjad 2020-12-14 18:17:57 +0300
  • 5606c88715 hot fixes Haroon Amjad 2020-12-14 18:13:38 +0300
  • 621abe3ca2 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-14 15:00:26 +0000
  • 92e6275162 Add Confirm send email dialog Mohammad Aljammal 2020-12-14 16:59:23 +0200
  • 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon Haroon Amjad 2020-12-14 16:38:29 +0300
  • e35f706be3 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-14 13:30:11 +0000
  • 4e823c2be4 fix chart and duplicated data in Patient Lab Result Mohammad Aljammal 2020-12-14 15:28:24 +0200
  • 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon haroon amjad 2020-12-14 14:44:11 +0300
  • 67f4b4e167 iOS Geofence in progress Zohaib Kambrani 2020-12-14 14:11:47 +0300
  • 4a43bcefe1 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-13 15:37:13 +0000
  • a6d3fce6fc remove ErOptions Mohammad Aljammal 2020-12-13 17:36:36 +0200
  • 8457972fda no message Zohaib Kambrani 2020-12-13 18:18:38 +0300
  • b13a56ffbd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon haroon amjad 2020-12-13 17:54:10 +0300
  • 951d9b553f fixes & updates haroon amjad 2020-12-13 17:53:14 +0300
  • 87ae3f906c Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-13 14:35:03 +0000
  • 71592adf32 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-13 17:32:59 +0300
  • 1f0d01b6cc language issue fixed Sultan Khan 2020-12-13 17:32:45 +0300
  • 2c50402aa8 language issue fixed Sultan Khan 2020-12-13 17:25:44 +0300
  • f394433b6e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon haroon amjad 2020-12-13 15:06:54 +0300
  • 9d046fd971 updates & fixes haroon amjad 2020-12-13 15:02:58 +0300
  • 9d76ee0154 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-13 11:15:54 +0000
  • 97776ce99b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix Mohammad Aljammal 2020-12-13 13:15:03 +0200
  • 4a12ac4163 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-13 11:14:35 +0000
  • b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues Mohammad Aljammal 2020-12-13 13:14:03 +0200
  • 92ba977fca no message Zohaib Kambrani 2020-12-13 13:39:01 +0300
  • c058cf0e93 finish address add/edit/delete/select mosazaid 2020-12-13 12:05:33 +0200
  • 557b8e814f voice command Sultan Khan 2020-12-13 10:01:16 +0300
  • 75de755ccd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon haroon amjad 2020-12-13 09:49:04 +0300
  • 6ac8d67b83 finish address add/edit/delete/select mosazaid 2020-12-12 17:27:55 +0200
  • c10d024700 no message Zohaib Kambrani 2020-12-10 18:21:10 +0300
  • 7bf181f3a6 Merge branch 'hot_fix' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-10 15:01:54 +0000
  • 08aa2de69b fix Prescriptions Service and design issues Mohammad Aljammal 2020-12-10 17:00:49 +0200
  • 8d5d55a150 Geofencing in progress Zohaib Kambrani 2020-12-10 17:47:55 +0300
  • a2ec01be5d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix Mohammad Aljammal 2020-12-10 16:08:31 +0200
  • 2f77592bac fix Prescriptions Service and design issues Mohammad Aljammal 2020-12-10 15:40:21 +0200
  • 740a294867 Translation & bug fixes haroon amjad 2020-12-10 16:36:18 +0300
  • 62b923b25e fix send rad report email Mohammad Aljammal 2020-12-10 14:53:09 +0200
  • 5083080ba3 fix vital sign details Mohammad Aljammal 2020-12-10 14:46:58 +0200
  • 1db5b15dcd Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon haroon amjad 2020-12-10 11:48:02 +0300
  • 9ecaaa1b12 radiology fix in appointment details haroon amjad 2020-12-10 11:46:57 +0300