Commit Graph

  • 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
  • 590dde314e Merge branch 'enad_pharmacy2' into 'development' enad hilal 2021-01-19 11:41:35 +0000
  • 535f8876f6 Merge branch 'ZohaibIqbalKambrani' into 'development' Mohammad Aljammal 2021-01-19 09:54:24 +0000
  • 69a98e8eb9 Merge branch 'ZohaibIqbalKambrani' into 'development' Zohaib Iqbal 2021-01-19 09:47:47 +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
  • 7343aee198 Merge branch 'fix_design' into 'development' mousa zaid 2021-01-19 08:04:32 +0000
  • fcfcd573dd Merge branch 'fix_design' into 'development' mousa zaid 2021-01-19 08:04:03 +0000
  • 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 fix_er 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
  • 9ff49b2dfd Merge branch 'fix_er' into 'development' Mohammad Aljammal 2021-01-18 11:09:25 +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
  • 6af414fc8d Merge branch 'fix_hhc_cmc' into 'development' Elham 2021-01-13 18:34:37 +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
  • 942cda72db Merge branch 'fix_design' into 'development' mousa zaid 2021-01-13 15:55:12 +0000
  • 80fdebc34d Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 15:22:45 +0000
  • b46c8e503b Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 15:22:39 +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
  • b337760043 Merge branch 'fix_design' into 'development' mousa zaid 2021-01-13 12:45:08 +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
  • 489fe9671c Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 10:44:38 +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
  • c35212f83f Merge branch 'design_issues' into 'development' Mohammad Aljammal 2021-01-13 08:04:57 +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
  • 2c36f6d0b1 Merge branch 'fix_design' into 'development' mousa zaid 2021-01-11 16:35:14 +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
  • e183179ff1 Merge branch 'development' into 'master' Mohammad Aljammal 2021-01-10 14:39:32 +0000
  • 5f788b556f Merge branch 'fix_android' into 'development' Mohammad Aljammal 2021-01-10 14:38:59 +0000
  • 535fc8c15e Merge branch 'fix_android' into 'development' Mohammad Aljammal 2021-01-10 14:38:55 +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
  • f0ca1b25ed Merge branch 'master' into 'development' Mohammad Aljammal 2021-01-10 14:20:51 +0000
  • 58c2401079 Merge branch 'pharmacy_merge' into 'master' Mohammad Aljammal 2021-01-10 14:20:21 +0000
  • 94ca926e51 Merge branch 'pharmacy_merge' into 'master' Mohammad Aljammal 2021-01-10 14:20:17 +0000
  • de1b7cc1d0 fix merge issues Mohammad Aljammal 2021-01-10 16:19:03 +0200
  • 3fb522e15f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge Mohammad Aljammal 2021-01-07 18:44:15 +0200
  • be1a2d4180 Merge branch 'master' into 'development' Mohammad Aljammal 2021-01-07 16:17:44 +0000
  • 0bf5b7a3e2 Merge branch 'master' into 'development' Mohammad Aljammal 2021-01-07 16:17:38 +0000
  • fa38d55c05 Merge branch 'change_color' into 'master' Mohammad Aljammal 2021-01-07 16:16:55 +0000
  • 44b341087f Merge branch 'change_color' into 'master' Mohammad Aljammal 2021-01-07 16:16:50 +0000
  • e61e02742c Merge branch 'fatima_merge' into 'pharmacy' Mohammad Aljammal 2021-01-07 16:16:22 +0000
  • 9c9f68c392 Merge branch 'fatima_merge' into 'pharmacy' Mohammad Aljammal 2021-01-07 16:16:15 +0000
  • c82f01cd1a fix merge issues Mohammad Aljammal 2021-01-07 18:15:34 +0200
  • 16d1f667d4 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge Mohammad Aljammal 2021-01-07 18:06:34 +0200
  • 7dd72d1324 Merge branch 'pharmacy_mosa_branch' into 'pharmacy' Mohammad Aljammal 2021-01-07 15:24:50 +0000
  • 9ce8d851da Merge branch 'pharmacy_mosa_branch' into 'pharmacy' mousa zaid 2021-01-07 15:07:14 +0000
  • d77a607b78 commit mosazaid 2021-01-07 17:06:49 +0200
  • 38d58ebaaf Merge branch 'pharmacy' into pharmacy_mosa_branch mosazaid 2021-01-07 17:06:31 +0200
  • b03b73ec26 Merge branch 'enad_pharmacy_merge' into 'pharmacy' Mohammad Aljammal 2021-01-07 12:53:09 +0000
  • ee6948e4c2 Merge branch 'enad_pharmacy_merge' into 'pharmacy' Mohammad Aljammal 2021-01-07 12:53:03 +0000
  • a2e5b48915 fix merge issues Mohammad Aljammal 2021-01-07 14:52:25 +0200
  • 6827efc1b6 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge Mohammad Aljammal 2021-01-07 14:50:00 +0200
  • d7fe93b3f3 Merge branch 'pharmacy-hussam' into 'pharmacy' Mohammad Aljammal 2021-01-07 12:46:55 +0000
  • 0ebb843cd8 Merge branch 'pharmacy-hussam' into 'pharmacy' hussam alhababieh 2021-01-07 12:46:02 +0000
  • 298b4d6525 change color Mohammad Aljammal 2021-01-07 13:36:30 +0200
  • 71417da030 Merge branch 'merge_dq_master' into 'master' Mohammad Aljammal 2021-01-06 12:35:37 +0000
  • 11803783ac Merge branch 'merge_dq_master' into 'master' Mohammad Aljammal 2021-01-06 12:35:28 +0000
  • 1968eb4682 return privilege Mohammad Aljammal 2021-01-06 14:34:42 +0200
  • 952e106531 return privilege Mohammad Aljammal 2021-01-06 14:29:25 +0200
  • f77d2b497e fix issues Mohammad Aljammal 2021-01-06 12:58:02 +0200
  • 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master Mohammad Aljammal 2021-01-06 11:02:04 +0200
  • 10734d5994 connecting pages. trnaslate. calling API. review page. product details page. Wishlist page. Brands page. enadhilal 2021-01-05 14:40:32 +0300
  • 4f59bd38df Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2021-01-01 12:47:00 +0000
  • 42bdc648e6 Merge branch 'hot_fixes' into 'diplomatic-quarter-live' Mohammad Aljammal 2021-01-01 12:46:44 +0000
  • 6bda03e935 hot fixing Mohammad Aljammal 2021-01-01 14:45:42 +0200
  • 0f3de39aba Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2021-01-01 10:40:48 +0000
  • e2fabac899 Merge branch 'sultan' into 'diplomatic-quarter-live' Sultan khan 2021-01-01 10:40:21 +0000
  • e6a94f8014 login design Sultan Khan 2021-01-01 11:40:39 +0300
  • b992978af4 login Sultan Khan 2021-01-01 09:06:35 +0300
  • 764e706000 dashboard issue fixed Sultan Khan 2020-12-31 20:03:06 +0300
  • 8ac3bc71dc Merge branch 'sultan' into 'diplomatic-quarter-live' Mohammad Aljammal 2020-12-31 15:49:51 +0000
  • c01246acf0 hot fix Sultan Khan 2020-12-30 20:29:57 +0300
  • 2b48578e07 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan Sultan Khan 2020-12-30 15:39:12 +0300
  • 016dffcb87 change Sultan Khan 2020-12-30 15:39:03 +0300