Commit Graph

1690 Commits

Author SHA1 Message Date
merdan cf4b6ca73a Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-15 13:46:30 +05:00
Sanjay 7e5711bf47 Changes-complete 2022-04-14 12:44:13 +05:30
Sanjay d466beadcd Resolved Conflict 2022-04-14 12:21:33 +05:30
Sanjay bb6c2b0c4c Issue #6260 fixed 2022-04-14 12:02:28 +05:30
Sanjay a8b4320d85 Issue #6261 fixed 2022-04-14 11:17:53 +05:30
merdan 3f5323dce3 vendors 2022-04-13 19:55:45 +05:00
merdan 0e819f43fe Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	public/installer/Seeder.php
2022-04-13 18:46:20 +05:00
Sanjay fb078025aa Issue #6278 Fixed 2022-04-12 15:43:11 +05:30
Sanjay bbdac0a50e Issue #6279 fixed 2022-04-11 12:56:06 +05:30
Devansh 1f15838622 Changes Done 2022-04-07 16:44:20 +05:30
Jitendra Singh 4cf8476016
Merge pull request #6254 from jitendra-webkul/master
Issue #6253 fixed
2022-04-06 17:31:20 +05:30
jitendra 173cff6e6e Issue #6253 fixed 2022-04-06 17:22:59 +05:30
Anmol-Chauhan 69eb9237a6 issue #5559 fixed 2022-04-05 19:55:46 +05:30
jitendra 622079a26b Issue #5967 fixed 2022-04-05 19:24:58 +05:30
jitendra fd7c6f1e98 Issue #6002 fixed 2022-04-05 18:25:17 +05:30
merdan 0a5d418095 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-05 16:43:35 +05:00
jitendra 2587f7f349 Issue #6229 fixed 2022-04-05 15:11:32 +05:30
Jitendra Singh 986ee8f4d0
Merge pull request #6211 from Sanjaybhattwebkul/update-cart-translation
cart-translation-updated
2022-04-04 17:40:33 +05:30
merdan d4d1da389f Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.json
	composer.lock
	config/app.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
2022-04-04 13:46:05 +05:00
jitendra 6386b1c1ad Issue #6040 fixed 2022-04-04 14:02:47 +05:30
jitendra 3b154ee86d Issue #6204 fixed 2022-04-01 22:09:48 +05:30
jitendra 74416ac5f3 Used PHP 8 Constructor Property Promotion 2022-04-01 20:27:11 +05:30
Sanjay 49a27ad560 cart-translation-updated 2022-04-01 17:37:48 +05:30
merdan 45e0d6fe7e Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-01 12:31:02 +05:00
jitendra e0edb82c40 Issue #6192 fixed 2022-03-31 13:08:15 +05:30
Jitendra Singh 10aa06fd75
Merge pull request #6185 from Anmol-Chauhan/issue-6156
Fixed #6156 issue
2022-03-31 11:52:46 +05:30
jitendra 4aa9fd2f70 Issue #6161 fixed 2022-03-31 11:26:51 +05:30
anmol chauhan a7d93b83b7 Fixed #6156 issue 2022-03-30 17:02:09 +05:30
jitendra 04a7e7a4c0 Issue #6181 fixed 2022-03-30 14:08:13 +05:30
jitendra 6854a3c149 Issue #6165 fixed 2022-03-30 13:38:16 +05:30
jitendra 434ad2dd79 Conflicts resolved 2022-03-30 13:11:08 +05:30
jitendra e9f18a9cf6 Issue #6177 fixed 2022-03-30 13:06:00 +05:30
Sanjay 895c0b32f8 Changes-done 2022-03-30 13:02:44 +05:30
Sanjay c32e7e325e Merge branch 'master' of https://github.com/Sanjaybhattwebkul/bagisto into thad-border 2022-03-30 11:22:24 +05:30
Sanjay 97ef0b4936 Changes-complete 2022-03-30 11:15:47 +05:30
Sanjay 11b44b25be Isue #6164 FIxed 2022-03-29 17:51:42 +05:30
merdan 5de0c82f74 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-29 17:06:50 +05:00
Sanjay 42dfa52b33 Bold-compare-text 2022-03-29 15:06:43 +05:30
jitendra 0df19a5e95 Issue #6153 fixed 2022-03-28 15:29:44 +05:30
jitendra 2c56804049 Issue #5964 fixed 2022-03-28 13:34:29 +05:30
jitendra e0ed2cb3d7 Issue #6117 fixed 2022-03-28 13:06:14 +05:30
jitendra 106301f356 Issue #6121 fixed 2022-03-28 11:48:06 +05:30
jitendra 6c55318106 Velocity quantity changes ui issues fixed 2022-03-25 19:20:40 +05:30
jitendra 42d9462804 Issue #6134 fixed 2022-03-25 19:05:31 +05:30
merdan b6c46480aa Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
2022-03-25 16:18:54 +05:00
jitendra 4fad3d8b69 Profile dropdown position fixed in velocity 2022-03-25 14:57:29 +05:30
jitendra af33dd8a99 Issue #6126 fixed 2022-03-25 13:29:22 +05:30
jitendra 25748c58dd Issue #6124 fixed 2022-03-25 13:10:18 +05:30
jitendra 954aceb840 Issue #6115 fixed 2022-03-25 10:56:58 +05:30
jitendra 4791fb9067 Issue #6103 fixed (Velocity responsive header issue fixed) 2022-03-24 13:27:46 +05:30