Commit Graph

  • b6c617888b Merge branch 'development' into Haroon haroon amjad 2021-02-09 17:00:54 +0300
  • ef8312f2b8 Merge branch 'development' into pharmacy-Fatima Fatimah Alshammari 2021-02-09 15:44:15 +0300
  • ce64da11e4 homepage and product details design Fatimah Alshammari 2021-02-09 15:37:27 +0300
  • cbe422cbc6 Merge branch 'hmg-services-fixing' into development mosazaid 2021-02-09 11:48:45 +0200
  • 0444b21101 Merge branch 'development' into hmg-services-fixing mosazaid 2021-02-09 11:35:27 +0200
  • 94ee969406 hhc msg translation Elham Rababah 2021-02-09 11:30:45 +0200
  • 8a1924cca2 fix images in hhc Elham Rababah 2021-02-09 11:23:46 +0200
  • d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp Sultan Khan 2021-02-08 18:56:24 +0300
  • 9fca52efca voice command Sultan Khan 2021-02-08 18:39:18 +0300
  • eeb073fb17 voice command Sultan Khan 2021-02-08 18:39:09 +0300
  • e964afd4f2 Merge branch 'fix_security_issue' into 'development' Mohammad Aljammal 2021-02-08 14:06:51 +0000
  • d477481856 fix security issues in pharmacy Mohammad Aljammal 2021-02-08 16:05:47 +0200
  • 63657cb7c4 Merge branch 'h2o_improvement' into 'development' Mohammad Aljammal 2021-02-08 12:38:33 +0000
  • e40ad85d61 H2O feature, setting page added Sikander Saleem 2021-02-08 15:32:46 +0300
  • 1d724a8db6 Merge branch 'h2o_improvement' into 'development' Mohammad Aljammal 2021-02-08 11:50:42 +0000
  • bd062150c1 H2O feature improvement Sikander Saleem 2021-02-08 11:26:56 +0300
  • aef4c7bfac H2O feature improvement Sikander Saleem 2021-02-08 11:24:53 +0300
  • 0b83089b86 Merge branch 'development' into Haroon haroon amjad 2021-02-04 09:41:20 +0300
  • 3832cee1ad Translation fixes haroon amjad 2021-02-04 09:39:01 +0300
  • 3b4e791017 H2O feature improvement Sikander Saleem 2021-02-01 17:18:05 +0300
  • ca82024f9e Merge branch 'fix_pharmacy' into 'development' Mohammad Aljammal 2021-02-01 07:55:04 +0000
  • bb42647c91 Merge branch 'development' into 'fix_pharmacy' Mohammad Aljammal 2021-02-01 07:50:59 +0000
  • f1f28f5ed0 Merge branch 'fix_login_design' into 'development' Mohammad Aljammal 2021-02-01 07:49:13 +0000
  • ab53ca82b1 fix colors issues Mohammad Aljammal 2021-02-01 09:43:43 +0200
  • 822defbd04 working on bmi calculator design and functionality mosazaid 2021-01-31 10:53:14 +0200
  • 3bad0a3804 Merge branch 'development' into Haroon haroon amjad 2021-01-31 10:33:21 +0300
  • 146019432a LiveCare schedule implemented haroon amjad 2021-01-30 19:14:02 +0300
  • 8f37fbf260 Qr icon added, notify me api added & improvements Sikander Saleem 2021-01-28 09:39:33 +0300
  • 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp Sultan Khan 2021-01-27 13:05:05 +0300
  • 0213264b7f bug fixes Sultan Khan 2021-01-27 10:42:01 +0300
  • 9ed8f2365d fix barcode issues Mohammad Aljammal 2021-01-26 13:06:32 +0200
  • 8eda45d637 Merge branch 'my_tracker' into 'development' Mohammad Aljammal 2021-01-26 10:43:14 +0000
  • 3e441c55b2 fix bottom nav bar Mohammad Aljammal 2021-01-26 12:41:50 +0200
  • 76b2342ad8 Merge branch 'my_tracker' into 'development' Mohammad Aljammal 2021-01-25 14:17:08 +0000
  • 9d8c1ddf63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker Mohammad Aljammal 2021-01-25 16:15:40 +0200
  • 484cca086e fix my my Trackers Mohammad Aljammal 2021-01-25 16:12:57 +0200
  • f0ee9db952 Merge branch 'Haroon' into 'development' Mohammad Aljammal 2021-01-25 07:41:21 +0000
  • ab158e14e9 Merge branch 'development' into Haroon haroon amjad 2021-01-24 14:53:35 +0300
  • 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized haroon amjad 2021-01-24 14:49:55 +0300
  • f6fd7587f2 Merge branch 'health-converter' into 'development' Mohammad Aljammal 2021-01-24 10:52:14 +0000
  • b767748315 health-converter fix hussam al-habibeh 2021-01-24 12:16:17 +0200
  • 97919c217f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter hussam al-habibeh 2021-01-24 12:15:14 +0200
  • 1ce0ef7b6c health-converter fix hussam al-habibeh 2021-01-24 12:04:02 +0200
  • dde10cd27b working in LiveCare Scheduling haroon amjad 2021-01-24 09:29:57 +0300
  • db2376f50c fix blood and weight on my trackers Mohammad Aljammal 2021-01-21 18:42:07 +0200
  • ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp Sultan Khan 2021-01-20 12:51:03 +0300
  • 6945230965 Merge branch 'development' into Haroon haroon amjad 2021-01-20 12:09:07 +0300
  • bd5e1ecd50 Merge branch 'fix_design' into 'development' Mohammad Aljammal 2021-01-20 08:25:18 +0000
  • 38d52b52c8 Merge branch 'development' into fix_design mosazaid 2021-01-20 10:22:15 +0200
  • 68f7a9ff9c login chnages Sultan Khan 2021-01-19 21:05:22 +0300
  • 174534d8a5 fix Blood donation functionality and design mosazaid 2021-01-19 18:00:34 +0200
  • 405f67be1e Merge branch 'pharmacy-Fatima' into 'development' Mohammad Aljammal 2021-01-19 15:44:53 +0000
  • 7a516cae51 Merge branch 'development' into pharmacy-Fatima Fatimah Alshammari 2021-01-19 16:16:57 +0300
  • f06a274ef6 Merge branch 'my_tracker' into 'development' Mohammad Aljammal 2021-01-19 12:28:44 +0000
  • f883e1bd78 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker Mohammad Aljammal 2021-01-19 14:24:47 +0200
  • 0b1014a91c fix blood sugar service on my tracker Mohammad Aljammal 2021-01-19 14:23:42 +0200
  • 0f22a50a5d Merge branch 'development' into pharmacy-Fatima Fatimah Alshammari 2021-01-19 15:22:07 +0300
  • 535f8876f6 Merge branch 'ZohaibIqbalKambrani' into 'development' Mohammad Aljammal 2021-01-19 09:54:24 +0000
  • 9a5daed5c3 Merge branch 'development' into ZohaibIqbalKambrani Zohaib Iqbal Kambrani 2021-01-19 12:46:39 +0300
  • b9022be8c1 Merge branch 'fix_design' into 'development' Mohammad Aljammal 2021-01-19 09:31:03 +0000
  • c65983bfdb code merged Sultan Khan 2021-01-19 12:29:10 +0300
  • 86cf9300e1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp Sultan Khan 2021-01-19 12:28:46 +0300
  • bbd953ae43 Order Delivery Driver tracking [inprogress] Zohaib Iqbal Kambrani 2021-01-19 11:41:55 +0300
  • 3a45239059 Merge branch 'development' into fix_design mosazaid 2021-01-18 17:58:00 +0200
  • f5d478fd27 re-design child vaccine and fix some funcrionalities mosazaid 2021-01-18 17:55:49 +0200
  • 4457b5f109 add translation to ER service Mohammad Aljammal 2021-01-18 14:05:35 +0200
  • 8d39e8b385 Merge branch 'fix_er' into 'development' Mohammad Aljammal 2021-01-18 11:09:37 +0000
  • 200334d8f8 Fix ER service Mohammad Aljammal 2021-01-17 17:07:50 +0200
  • cf59057836 Merge branch 'fix_hhc_cmc' into 'development' Mohammad Aljammal 2021-01-14 08:44:18 +0000
  • 4ecce79258 first step from fix CMC Elham Rababah 2021-01-13 20:33:20 +0200
  • c9edb37a3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc Elham Rababah 2021-01-13 18:00:45 +0200
  • d7a046f9ca fix issue on cmc Elham Rababah 2021-01-13 17:58:45 +0200
  • 1cb5e250ed Merge branch 'fix_design' into 'development' Mohammad Aljammal 2021-01-13 15:55:36 +0000
  • 80fdebc34d Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 15:22:45 +0000
  • b63025a9b3 return CMC HHC Mohammad Aljammal 2021-01-13 17:21:14 +0200
  • ff85b2f1b2 Merge branch 'development' into fix_design mosazaid 2021-01-13 15:53:48 +0200
  • 5bcc67b77d Nearest Er fix design mosazaid 2021-01-13 15:53:31 +0200
  • 8f499578d5 Merge branch 'fix_design' into 'development' Mohammad Aljammal 2021-01-13 12:47:11 +0000
  • 01bfe84644 solving NearestEr design problem mosazaid 2021-01-13 14:44:23 +0200
  • e71a56ed51 Merge branch 'development' into fix_design mosazaid 2021-01-13 13:54:47 +0200
  • d2e1a323ce simple fix mosazaid 2021-01-13 13:50:39 +0200
  • e2bce87e34 resolve merge conflicts. Zohaib Iqbal Kambrani 2021-01-13 14:39:36 +0300
  • 013e3b0f1c Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 10:44:44 +0000
  • 30ddea6419 hot fixing Mohammad Aljammal 2021-01-13 12:44:11 +0200
  • dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani Zohaib Iqbal Kambrani 2021-01-13 12:16:15 +0300
  • ed729689a9 Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 08:05:01 +0000
  • 634c874eee fix design issues Mohammad Aljammal 2021-01-13 10:02:39 +0200
  • a1b2709ac8 fixed orders Fatimah Alshammari 2021-01-13 09:42:51 +0300
  • b8229fa8cd Merge branch 'development' into enad_pharmacy2 enadhilal 2021-01-13 09:15:48 +0300
  • ba4003cb56 Merge branch 'pharmacy' into pharmacy-Fatima Fatimah Alshammari 2021-01-12 15:13:09 +0300
  • 52fa0f6f89 fixed orders Fatimah Alshammari 2021-01-12 14:47:06 +0300
  • b01e718ae3 Merge branch 'fix_design' into 'development' Mohammad Aljammal 2021-01-12 08:23:21 +0000
  • 2843b1393e some design enhancments mosazaid 2021-01-11 18:33:50 +0200
  • 72290f041f fix design Mohammad Aljammal 2021-01-11 11:39:27 +0200
  • 975371a7fa Merge branch 'development' into 'master' Mohammad Aljammal 2021-01-10 14:39:35 +0000
  • 5f788b556f Merge branch 'fix_android' into 'development' Mohammad Aljammal 2021-01-10 14:38:59 +0000
  • 1f03919094 fix android Mohammad Aljammal 2021-01-10 16:38:36 +0200
  • 05af339fed Merge branch 'master' into 'development' Mohammad Aljammal 2021-01-10 14:20:54 +0000
  • 58c2401079 Merge branch 'pharmacy_merge' into 'master' Mohammad Aljammal 2021-01-10 14:20:21 +0000
  • de1b7cc1d0 fix merge issues Mohammad Aljammal 2021-01-10 16:19:03 +0200