Commit Graph

10945 Commits

Author SHA1 Message Date
Abhishek Kathuria 8b37d39c9c Resolved conflict 2022-08-03 18:04:32 +05:30
Abhishek Kathuria c2de509e7a Merge branch 'issue_6366' of github.com:akathuria289/bagisto into issue_6366 2022-08-03 18:03:07 +05:30
Jitendra Singh 5e2b4498e9
Merge pull request #6607 from papnoisanjeev/image-upload-and-remove-issue
Product image upload and remove issue.
2022-08-03 12:33:14 +05:30
sanjeev d83ea3edc3 recompiled 2022-08-03 12:18:14 +05:30
Jitendra Singh 08d70457cf
Merge pull request #6599 from Sanjaybhattwebkul/video-issue
Issue ##6547 fixed
2022-08-03 12:12:17 +05:30
Jitendra Singh d9ef6bdd7c
Merge pull request #6528 from akathuria289/issue_fixed_#6428
Fixed issue #6428
2022-08-03 12:10:59 +05:30
sanjay bhatt 5e94865e31 Recompiled 2022-08-03 11:47:14 +05:30
sanjay bhatt ce7bed2155 Merge remote-tracking branch 'Upstream/master' into video-issue 2022-08-03 11:45:33 +05:30
Jitendra Singh 346cb7e93a
Merge pull request #6550 from papnoisanjeev/coupon-issue-cart
Showing warning in case coupon already applied.
2022-08-03 11:17:35 +05:30
Jitendra Singh 62699e05f4
Merge pull request #6566 from abhishekkathuria/issue_6484
Fixed issue #6484
2022-08-03 11:12:14 +05:30
Jitendra Singh 8c0ff81050
Merge pull request #6504 from Sanjaybhattwebkul/guest-wishlist
Issue #6444 fixed
2022-08-03 11:11:15 +05:30
Jitendra Singh 07c2ebc7a6
Merge pull request #6612 from akathuria289/issue_5463
Fixed issue #5463
2022-08-03 11:01:18 +05:30
Abhishek Kathuria dd7cc8cfb2 Clear All Filter Added 2022-08-02 19:20:56 +05:30
sanjeev 24e2275434 recompiled 2022-08-02 19:14:36 +05:30
Jitendra Singh c6c27815a1
Merge pull request #6602 from devansh-webkul/issues/6453
HTTP Kernel Updated #6453
2022-08-02 18:55:53 +05:30
Jitendra Singh 53fe41fdaf
Merge pull request #6610 from papnoisanjeev/wishlist-item-show-issue-if-removed-last-page-items
Wishlist not showing if removed all items from last page.
2022-08-02 18:55:24 +05:30
Jitendra Singh 9d70789844
Merge pull request #6616 from akathuria289/issue_5801
Fixed issue #5801
2022-08-02 18:53:05 +05:30
Jitendra Singh b2c357f103
Merge pull request #6618 from papnoisanjeev/customer-profile-image-show-when-login
Showing profile image when customer login.
2022-08-02 18:52:56 +05:30
Jitendra Singh 8955477d6e
Merge pull request #6603 from papnoisanjeev/cart-rule-coupon-type-selection-manual-hide-auto-generate-details
On Selection of manual coupon code, Auto Generate Coupon Code section details should be hide.
2022-08-02 18:52:03 +05:30
sanjeev e469eda82f customer profile pic remove issue resolved for velocity theme 2022-08-02 17:19:31 +05:30
Jitendra Singh b0fe69c450
Merge pull request #6605 from papnoisanjeev/applied-filter-condition-show
Applied condition showing during filtering  #6408
2022-08-02 17:11:02 +05:30
sanjeev f4fec28478 Recompile 2022-08-02 16:00:20 +05:30
sanjeev 2f56948dd7 Profile image remove issue fixed if updating profile using default theme. 2022-08-02 15:52:53 +05:30
sanjeev 780fff3a13 removed profile pic for default theme 2022-08-02 13:20:24 +05:30
sanjeev 70131e9e24 recompile and fix 2022-08-02 12:33:12 +05:30
Devansh Bawari 1fa89eb5ac Merge branch 'master' into issues/6453 2022-08-02 12:21:21 +05:30
sanjeev c5dea84899 recompiled 2022-08-02 11:50:05 +05:30
Jitendra Singh 185f61354e
Merge pull request #6621 from devansh-webkul/issues/datagrid-issue
[Datagrid] Last Page Issue Fixed
2022-08-02 11:39:12 +05:30
Devansh Bawari 063e929b34 Changes Done 2022-08-02 11:37:54 +05:30
Devansh Bawari 8af7989cac Last Page Issue Fixed 2022-08-02 11:26:56 +05:30
sanjeev 434137b280 Recompiled 2022-08-02 11:10:52 +05:30
sanjeev 4d3b541d5e Merge remote-tracking branch 'upstream/master' into customer-profile-image-show-when-login 2022-08-02 11:09:53 +05:30
Abhishek Kathuria 95947c862d resolved conflict 2022-08-02 11:02:31 +05:30
Abhishek Kathuria 06341b28dc Fixed formatting 2022-08-02 10:59:19 +05:30
Jitendra Singh fa8f3e6d4e
Merge pull request #6617 from akathuria289/issue_5584
FIxed issue #5584
2022-08-02 10:48:29 +05:30
Jitendra Singh df17c0e2de
Merge pull request #6619 from devansh-webkul/issues/6429
Handled Cart Quantity #6429
2022-08-02 10:47:05 +05:30
Jitendra Singh 6dc80b8642
Merge pull request #6620 from papnoisanjeev/active-inactive-filter-meaningful
Showing Active/Inactive in case status filter applied instead of 0/1 also dependent translation (from admin) added into UI package itself.
2022-08-02 10:46:04 +05:30
Jitendra Singh d4b02c370d
Merge pull request #6614 from akathuria289/issue_6331
Fixed issue #6331
2022-08-02 10:45:39 +05:30
Abhishek Kathuria 48138036f7 fixed formatting 2022-08-01 17:36:00 +05:30
Abhishek Kathuria be80f0eb6a fixed formatting 2022-08-01 17:34:40 +05:30
Abhishek Kathuria 7926656b34 fixed issue 2022-08-01 17:27:47 +05:30
Abhishek Kathuria 479704a70c fixed issue 2022-08-01 17:26:27 +05:30
sanjeev e017630ccb Showing Active/Inactive in case status filter applied instead of 0/1 also dependent translation (from admin) added into UI package itself 2022-08-01 15:35:12 +05:30
Devansh Bawari 1b9e4953ee Block Issue Fixed In Default Theme 2022-08-01 15:20:40 +05:30
Devansh Bawari 0b8efd84dd Handled Cart Quantity 2022-08-01 15:12:13 +05:30
Devansh Bawari 46fdea42cf Merge branch 'master' into issues/6453 2022-08-01 13:06:47 +05:30
sanjeev e979f6f2e7 Removed space after bracket and added and added a line after block 2022-08-01 12:34:14 +05:30
Abhishek Kathuria baa44c0e93 fixed issue 2022-08-01 12:00:54 +05:30
sanjeev 5014686b01 Added css updates into scss files 2022-08-01 10:21:56 +05:30
sanjeev cef68ce115 Showing profile image when customer login 2022-07-30 18:22:58 +05:30