Commit Graph

9748 Commits

Author SHA1 Message Date
Deepak Singh Gusain 786075045d fixed conflicts at nav left 2022-01-21 14:19:32 +05:30
Deepak Singh Gusain 590fdb8d70 Merge branch 'master' into admin-rtl-menu 2022-01-21 14:17:37 +05:30
Devansh 7c7fac9fb3
Merge pull request #5669 from deepaksinghgusain227/bliss-delete-button-issue
Fixed alignment of delete button at customer profile page at bliss theme
2022-01-21 13:54:48 +05:30
Deepak Singh Gusain 227d2157fa resloved conflicts 2022-01-21 12:42:19 +05:30
Glenn Hermans 39a854adcd
Merge pull request #5668 from deepaksinghgusain227/sidebar-tab-one-at-a-time-issue
Fixed the issue of sidebar only one tab at one time issue
2022-01-20 19:12:14 +01:00
Deepak Singh Gusain 8e1605a914 remove space' 2022-01-20 19:58:34 +05:30
Deepak Singh Gusain f34c6ad854 Fixed alignment of delete button at customer profile page at bliss theme 2022-01-20 19:47:15 +05:30
Deepak Singh Gusain 7a15b10951 icon issue 2022-01-20 19:32:13 +05:30
Deepak Singh Gusain b8cc78e971 Fixed the issue of sidebar only one tab at one time issue 2022-01-20 19:27:32 +05:30
Devansh 0c33f85f61
Merge pull request #5666 from devansh-webkul/5631
Added Underscore #5631
2022-01-20 17:04:49 +05:30
Devansh 64478882c1
Merge pull request #5637 from deepaksinghgusain227/switch-button-ui-issue
fixed ui issue of switch button at dark mode
2022-01-20 17:04:07 +05:30
Devansh fb6db067b8 Added 2022-01-20 16:56:41 +05:30
Deepak Singh Gusain 841693b7de resolved Confilicts 2022-01-20 16:40:43 +05:30
Devansh 073c0fa404
Merge pull request #5662 from devansh-webkul/default-argument-added
Default argument to `.env` added
2022-01-20 15:16:51 +05:30
Devansh 97c9bdd7d1 Default Argument To .env Added 2022-01-20 15:14:26 +05:30
Devansh 9d09e79533
Merge pull request #5658 from deepaksinghgusain227/navbar-top-account-ui
Fixed Admin Account Ui issue
2022-01-20 14:59:52 +05:30
Deepak Singh Gusain 5b268226cf compile assets 2022-01-20 14:41:06 +05:30
Deepak Singh Gusain 732a7f83b1 work on locale-icon 2022-01-20 14:39:56 +05:30
Devansh 69eff9dbdd
Merge pull request #5660 from devansh-webkul/added-gender
Select Gender Added #5531#issuecomment-1017148009
2022-01-20 12:07:45 +05:30
Devansh a27872970d
Merge pull request #5653 from deepaksinghgusain227/velocity-datagrid
Velocity datagrid
2022-01-20 12:06:57 +05:30
Devansh 7f15ca3dc8 Select Gender Added 2022-01-20 11:39:16 +05:30
Devansh fd1de0f48e
Merge pull request #5656 from devansh-webkul/added-support
Enhancement Done For Invoice PDF
2022-01-20 11:15:14 +05:30
Deepak Singh Gusain 2e85c41c69 Fixed Admin Account Ui issue 2022-01-20 11:12:13 +05:30
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
Devansh 41b0d284b9 Enhanced PDF 2022-01-19 23:36:04 +05:30
Devansh c89120cc4d Fixed Euro Currency Support 2022-01-19 20:43:28 +05:30
Glenn Hermans 80bab24570
Merge pull request #5655 from deepaksinghgusain227/locale-issue
Fixed Locale Issue
2022-01-19 14:12:33 +01:00
Deepak Singh Gusain e475f8a05c Fixed Locale Issue 2022-01-19 17:52:13 +05:30
Deepak Singh Gusain 6b107ef2be merge master 2022-01-19 17:06:45 +05:30
Deepak Singh Gusain b42bf8fa45 fixed datagrid issue at Velocity theme 2022-01-19 17:03:06 +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 e3eaadb47f
Merge pull request #5649 from devansh-webkul/admin-404-issue
Fixed Admin 404 Issue
2022-01-19 11:48:20 +05:30
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
Glenn Hermans f4cbc59f81
Merge pull request #5645 from deepaksinghgusain227/dashboard-icon
update the icon of dashboard-active.svg
2022-01-18 17:14:29 +01:00
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
Glenn Hermans 71f6de2911
Merge pull request #5644 from deepaksinghgusain227/translation-add-acc-to-locale
Translation added according to locale for Notification
2022-01-18 15:14:16 +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