Commit Graph

7279 Commits

Author SHA1 Message Date
Deepak Singh Gusain 65260abdff resolved conflicts 2022-01-20 10:35:52 +05:30
Deepak Singh Gusain a639f503d0 resolved conflicts 2022-01-20 10:32:25 +05:30
Deepak Singh Gusain e475f8a05c Fixed Locale Issue 2022-01-19 17:52:13 +05:30
Glenn Hermans df3b88e79d
Merge pull request #5646 from deepaksinghgusain227/select-ui-issue
Fixed multi select ui issue
2022-01-19 11:08:20 +01:00
Devansh 9e8a7d49c7 Fixed Admin 404 Issue 2022-01-19 11:35:16 +05:30
Deepak Singh Gusain 98a89fa0da Fixed multi select ui issue 2022-01-19 10:19:11 +05:30
Deepak Singh Gusain 65c0723014 fixed conflicts 2022-01-19 09:55:34 +05:30
Deepak Singh Gusain eee1f24e5e update the icon of dashboard-active.svg 2022-01-18 19:48:49 +05:30
Glenn Hermans 2577714d76
Merge pull request #5639 from deepaksinghgusain227/notification-tooltip
fixed when we hover over bell icon tooltip is not showing
2022-01-18 15:14:41 +01:00
Deepak Singh Gusain a3d74c8531 added notification-title in place of title 2022-01-18 18:49:43 +05:30
Deepak Singh Gusain b4c9938e9c merge master 2022-01-18 18:44:16 +05:30
Deepak Singh Gusain 8e3d6667f9 formatted scss 2022-01-18 18:41:26 +05:30
Deepak Singh Gusain 1cbd3524cc add scss for rtl and normal direction 2022-01-18 18:34:44 +05:30
Deepak Singh Gusain 7d38c0aedd changes in nl translation 2022-01-18 18:15:25 +05:30
Deepak Singh Gusain 95ff54505c turkish translation added for notification 2022-01-18 18:01:14 +05:30
Deepak Singh Gusain cdbb3484f8 portuguese translation added for notification 2022-01-18 17:57:31 +05:30
Deepak Singh Gusain 4efa5daa3f polish translation added for notification 2022-01-18 17:52:56 +05:30
Deepak Singh Gusain d5ef4d61b0 dutch translation added for notification 2022-01-18 17:49:56 +05:30
Deepak Singh Gusain b50afe02a7 italian translation added for notification 2022-01-18 17:45:49 +05:30
Deepak Singh Gusain c7e9c74d47 Finnish translation added for notification 2022-01-18 17:41:21 +05:30
Deepak Singh Gusain d258189a11 Persian translation added for notification 2022-01-18 17:37:18 +05:30
Deepak Singh Gusain 3ea98daf30 Spanish translation added for notification 2022-01-18 17:31:06 +05:30
Deepak Singh Gusain 5aa5185e04 german translation added for notification 2022-01-18 17:14:25 +05:30
Deepak Singh Gusain b8e8913f26 Notification arabic translation added 2022-01-18 17:06:00 +05:30
Deepak Singh Gusain 7860f23ffa formatted code 2022-01-18 16:33:10 +05:30
Devansh 3b680fc98b
Merge pull request #5638 from devansh-webkul/fixed-cart-alignment 2022-01-18 16:16:41 +05:30
Deepak Singh Gusain bbfe5ab57e add space 2022-01-18 15:17:15 +05:30
Deepak Singh Gusain e1a1d1d821 Fixed Dark mode color issue 2022-01-18 15:14:57 +05:30
Deepak Singh Gusain 999026d538 fixed conflicts 2022-01-18 15:01:56 +05:30
Deepak Singh Gusain 0f316e78fe Fixed New admin theme - RTL menu 2022-01-18 14:57:47 +05:30
Glenn Hermans 95d5d826ab
Merge pull request #5641 from devansh-webkul/fixed-sidebar
Fixed CMS Sidebar #5625
2022-01-18 10:23:10 +01:00
Glenn Hermans 87b0cf41d7
Merge pull request #5612 from deepaksinghgusain227/catalog-rule-cart-rule-ui
fixed cart-rule catalog-rule condition ui
2022-01-18 10:20:59 +01:00
Devansh 46d7503917 Added Sidebar 2022-01-18 14:35:19 +05:30
Devansh fcc07d9fa2 Fixed Velocity Profile Issue 2022-01-18 14:06:46 +05:30
Deepak Singh Gusain eb353e6f1a fixed when we hover over bell icon tooltip is not showing 2022-01-18 14:02:41 +05:30
Devansh 97ae274509 Fixed Cart Alignment 2022-01-18 13:50:39 +05:30
Deepak Singh Gusain 253c759669 fixed Conflicts 2022-01-18 13:48:27 +05:30
Devansh 0c2e17a0b4 Moved Velocity 2022-01-17 20:13:52 +05:30
Devansh 09a9b1f1db Moved Locale Images To Core 2022-01-17 19:41:20 +05:30
Deepak Singh Gusain f55f760b33 Fixed catalog header ui issue 2022-01-14 16:37:35 +05:30
Deepak Singh Gusain 23c9649ca2
Merge branch 'bagisto:master' into mark-as-read 2022-01-14 16:08:43 +05:30
Glenn Hermans 88f4b7a91d
Merge pull request #5607 from deepaksinghgusain227/notification-ui
Fixed responsive issue of notification dropdown
2022-01-14 11:26:21 +01:00
Deepak Singh Gusain eeb114d978 fixed cart-rule catalog-rule condition ui 2022-01-14 15:51:48 +05:30
Deepak Singh Gusain ff1cd8bd01 compiled css/js 2022-01-14 13:26:37 +05:30
Deepak Singh Gusain eb1e77529d
Merge branch 'bagisto:master' into mark-as-read 2022-01-14 13:21:42 +05:30
Deepak Singh Gusain 2dc2f59aed compiled css/js 2022-01-14 12:17:02 +05:30
Devansh 703fd48f49
Merge pull request #5582 from devansh-webkul/rest-api
Completed Rest API Enhancement #5143
2022-01-13 19:16:16 +05:30
Deepak Singh Gusain 4c95488bc9 Fixed Mark as Read Issue 2022-01-13 18:40:32 +05:30
Deepak Singh Gusain b40358534f Fixed responsive issue of notification dropdown 2022-01-13 18:13:06 +05:30
Deepak Singh Gusain 83575ceff2 rename id name and compiled css/js 2022-01-13 17:59:19 +05:30