Commit Graph

10014 Commits

Author SHA1 Message Date
merdan 9a7d91c9fc price fix 2022-02-06 20:54:10 +05:00
merdan 02b7f4b11b customer auth fix 2022-02-06 20:42:03 +05:00
merdan 992d2d0b69 customer auth fix 2022-02-06 20:38:22 +05:00
merdan dbd929b4c7 customer auth fix 2022-02-06 20:29:52 +05:00
merdan 8374d906eb Merge branch 'dev' into sarga-v1 2022-02-05 16:26:15 +05:00
merdan 91b7e84cb6 Merge branch 'master' of https://github.com/bagisto/bagisto into dev
 Conflicts:
	packages/Webkul/Core/src/Core.php
	packages/Webkul/Product/src/Models/ProductImage.php
2022-02-05 14:43:51 +05:00
merdan 6b4d3d6466 Merge branch 'dev' into sarga-v1 2022-02-05 14:28:26 +05:00
merdan 6de2a82f7c scrap fix 2022-02-05 14:28:03 +05:00
Glenn Hermans c1dceb0a01
Merge pull request #5751 from deepaksinghgusain227/update-button-alligment
Fixed ui of checkout button shopping continue and update cart
2022-02-04 15:04:56 +01:00
Deepak Singh Gusain 6db169a760 Fixed ui of checkout button shopping continue and update cart 2022-02-04 18:43:42 +05:30
Glenn Hermans ea2f88d4fe
Merge pull request #5749 from deepaksinghgusain227/back-button-bliss-theme-product-checkout-onepage
Fixed back button issue at bliss theme
2022-02-04 12:56:51 +01:00
Deepak Singh Gusain 36c013d1a8 Fixed back button issue at bliss theme 2022-02-04 17:11:13 +05:30
Glenn Hermans 5d0a532375
Merge pull request #5748 from deepaksinghgusain227/remove-button-alignment-velocity-theme
Fixed alignment of remove button at velocity theme
2022-02-04 12:07:32 +01:00
merdan ece2b58d60 scrap fix 2022-02-04 15:48:26 +05:00
Deepak Singh Gusain 6de3665e2b merge master 2022-02-04 14:39:41 +05:30
Deepak Singh Gusain b31e7670a7 Fixed alignment of remove button at velocity theme 2022-02-04 14:34:07 +05:30
Devansh cb1fa47765
Merge pull request #5747 from devansh-webkul/datagrid-plus
Records Found Added To Datagrid Plus
2022-02-04 14:32:37 +05:30
Devansh ae4d50b232 Merge remote-tracking branch 'upstream/master' into datagrid-plus 2022-02-04 14:32:06 +05:30
Devansh 912d72edfe Records Found Added To Datagrid Plus 2022-02-04 14:29:47 +05:30
merdan 3be851946f scrap fix 2022-02-04 13:19:32 +05:00
merdan 18059598f1 scrap fix 2022-02-04 13:13:04 +05:00
Glenn Hermans b2f82fd13c
Merge pull request #5744 from deepaksinghgusain227/remove-button-wishlist-ui-issue
Fixed ui issue of remove button at checkout view page
2022-02-04 08:45:42 +01:00
Devansh e022ba5427
Merge pull request #5745 from devansh-webkul/currency-issue
Currency symbol issue fixed
2022-02-04 12:56:57 +05:30
Devansh 851637ac11 Made Optional 2022-02-04 12:34:33 +05:30
Deepak Singh Gusain 9335cfb27b Resolve conflicts 2022-02-04 12:14:33 +05:30
Deepak Singh Gusain 3b79272383 Fixed ui issue of remove button at checkout view page 2022-02-04 12:04:32 +05:30
merdan 3e067df079 category filters 2022-02-04 11:01:24 +05:00
Devansh df62530b0d
Merge pull request #5742 from deepaksinghgusain227/compare-view-bliss-theme
fixed compare view issue
2022-02-04 11:24:04 +05:30
Deepak Singh Gusain e123fbdb7e add spaces 2022-02-04 11:07:12 +05:30
Deepak Singh Gusain 2337d63c3b Resolve conflicts 2022-02-04 11:03:37 +05:30
Devansh d8fca6a360
Merge pull request #5741 from deepaksinghgusain227/add-wishlist-bliss-theme
Add Wishlist   at header part in bliss theme
2022-02-04 11:00:00 +05:30
Deepak Singh Gusain fe6fa7bc7a reslove conflicts 2022-02-04 09:50:55 +05:30
Deepak Singh Gusain 0397c3d6c0 reslove conficls 2022-02-04 09:48:21 +05:30
Glenn Hermans 96d084488d
Merge pull request #5701 from devansh-webkul/optional-fields-checkout
Address Informations Optional Fields #4653
2022-02-03 14:09:34 +01:00
Devansh 22933b19a5 Merge branch 'master' into optional-fields-checkout 2022-02-03 18:32:42 +05:30
Devansh a4559d6fb9
Merge pull request #5737 from devansh-webkul/draggable-images-enhancement 2022-02-03 18:28:49 +05:30
Devansh 6d8ef13120 Variant Images Handled 2022-02-03 17:44:45 +05:30
Devansh 757dc9a8ed Refactored Image And Video Repository 2022-02-03 16:42:37 +05:30
merdan 228b7ad947 category filters 2022-02-03 15:53:47 +05:00
Devansh fb1fbfb873 Moved Video Accordion After Images 2022-02-03 14:41:08 +05:30
Devansh 3b91f5edbd Video Draggable Feature Added 2022-02-03 14:08:34 +05:30
merdan 3ccddbf443 category filters 2022-02-03 13:34:16 +05:00
Glenn Hermans 913908afc8
Merge pull request #5739 from deepaksinghgusain227/downloadable-customer-panel-ui-issue
Fixed Downloadable customer panel header ui
2022-02-02 14:23:06 +01:00
Deepak Singh Gusain be1aa76b32 fixed compare view issue 2022-02-02 18:27:41 +05:30
Deepak Singh Gusain 978df9e16f recompile assets 2022-02-02 17:06:50 +05:30
Deepak Singh Gusain 811dfebec7
Merge branch 'bagisto:master' into downloadable-customer-panel-ui-issue 2022-02-02 17:01:25 +05:30
Deepak Singh Gusain 45b8ff2bcb Add Wishlist at header part in bliss theme 2022-02-02 16:55:20 +05:30
Glenn Hermans 4cead36f08
Merge pull request #5740 from devansh-webkul/customer-suspend-ability
Suspend Customer Ability Added In Admin #5300
2022-02-02 12:20:59 +01:00
Devansh ff1f77fe8e Suspend Customer Ability Added In Admin 2022-02-02 15:47:09 +05:30
Deepak Singh Gusain 98d807c6d1
Merge branch 'bagisto:master' into downloadable-customer-panel-ui-issue 2022-02-02 14:41:37 +05:30