merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,182 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

1659 Commits

Author SHA1 Message Date
merdan 298edeb037 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-02-24 17:02:34 +05:00
prateek srivastava 2c53b407ef issue #5789 fixed 2022-02-24 17:00:05 +05:30
merdan 84d77539e9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	composer.lock
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
 2022-02-22 17:50:56 +05:00
Sanjay 804db29e40 changes complete 2022-02-22 14:58:49 +05:30
Sanjay 181caa1e98 viewPassword-added-valocity 2022-02-22 12:41:45 +05:30
Sanjay bff5b0d6af Showpassword-option-added 2022-02-18 10:39:41 +05:30
prateek srivastava e6559d26c4 issue #5830 fixed 2022-02-17 17:05:48 +05:30
prateek srivastava 2c93271f2c issue #5797 fixed 2022-02-17 13:11:16 +05:30
Devansh 94508a71aa
Merge pull request #5816 from devansh-webkul/velocity-theme-quantity-box-removed 
Quantity Box Removed As From Backend It Is False #5687
 2022-02-15 18:19:45 +05:30
Devansh c6a4adbda1 Quantity Box Removed 2022-02-15 14:20:20 +05:30
Devansh edf0299bdb Merged Changes 2022-02-15 14:06:16 +05:30
Devansh ad39f779dd Merge remote-tracking branch 'upstream/master' into image-issue 2022-02-15 12:45:17 +05:30
Devansh 5b07ba7ad5 Screen Width Adjusted 2022-02-15 12:01:11 +05:30
Devansh 5ec3485257 Image Issue Fixed 2022-02-15 10:44:26 +05:30
Devansh 187e7d816d Merge branch 'master' into s3-image-cache 2022-02-15 09:27:28 +05:30
Devansh d57219df07 Added Space In RTL 2022-02-11 19:39:44 +05:30
Devansh 51d8954f23 Merge branch 'master' into s3-image-cache 2022-02-11 18:25:13 +05:30
Devansh 9d99fdf186 All Destroy Method Updated 2022-02-11 18:04:38 +05:30
Deepak Singh Gusain d2c9a5735a resolve commit 2022-02-11 15:18:00 +05:30
Deepak Singh Gusain 1d452e34b1 Fixed calender icon issue customer profile at velocity theme 2022-02-11 12:45:32 +05:30
Devansh 315d02d087 Merge branch 'master' into s3-image-cache 2022-02-11 11:51:35 +05:30
Deepak Singh Gusain a55c9a91af Fixed Slider image issue 2022-02-11 11:44:49 +05:30
kideny 3713fad54f add more files 2022-02-10 21:59:54 +08:00
Devansh 3137665a8d Compare Product Storage Url Added 2022-02-09 16:23:57 +05:30
Devansh 11743b899e Urls Via Storage Facade 2022-02-09 13:35:44 +05:30
Devansh 6d3814f475 Category Images And Components Fixed 2022-02-09 12:59:37 +05:30
Devansh fe244227ff Update Velocity Header Content 2022-02-08 17:21:16 +05:30
Devansh 5bb56f708c Datagrid Trait Plus Added And Test Case Improved 2022-02-07 16:06:38 +05:30
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
Deepak Singh Gusain 6db169a760 Fixed ui of checkout button shopping continue and update cart 2022-02-04 18:43:42 +05:30
Deepak Singh Gusain b31e7670a7 Fixed alignment of remove button at velocity theme 2022-02-04 14:34:07 +05:30
Devansh c9b60b2c10 Squashed All Commits 2022-02-01 16:44:16 +05:30
Devansh 254b4fbec8 Dependency Removed 2022-02-01 16:30:13 +05:30
Devansh a4f7656ae5 Velocity Package Dependency Updated 2022-02-01 16:11:47 +05:30
merdan 690a33710f Merge branch 'master' of https://github.com/bagisto/bagisto into dev 
 Conflicts:
	.env.example
	README.md
	composer.json
	composer.lock
	config/app.php
	config/scout.php
	packages/Webkul/API/Http/Controllers/Shop/AddressController.php
	packages/Webkul/API/Http/Resources/Checkout/Cart.php
	packages/Webkul/API/Http/Resources/Sales/Order.php
	packages/Webkul/API/Http/routes.php
	packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php
	packages/Webkul/Core/src/Resources/lang/fa/validation.php
	packages/Webkul/Core/src/Resources/lang/it/app.php
	packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
	packages/Webkul/Core/src/Resources/lang/tr/app.php
	packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php
	packages/Webkul/Velocity/publishable/assets/js/components.js
	packages/Webkul/Velocity/publishable/assets/js/manifest.js
	public/installer/Classes/Requirement.php
 2022-02-01 15:01:06 +05:00
Devansh 9b2c091c2c Guest Checkout Page Fixed 2022-02-01 14:17:12 +05:30
Devansh 63b694a673 Squashed Commits 2022-01-31 12:14:02 +05:30
Devansh 39836f9a7b Some Cleanup Done 2022-01-28 16:25:34 +05:30
Devansh e09e9f2845 Layered Navigation Without Category 2022-01-28 16:14:07 +05:30
Deepak Singh Gusain 1693fb3350 resolve conflicts 2022-01-27 09:56:40 +05:30
Deepak Singh Gusain a80ed0ffba UI issue in cart page on phone view 2022-01-25 19:07:50 +05:30
Deepak Singh Gusain 99732c18c6 fixed conflicts 2022-01-25 17:35:39 +05:30
Deepak Singh Gusain 38974dc6fd work on header component for responsive header 2022-01-25 17:19:00 +05:30
Deepak Singh Gusain c2f9a14e4b responsive velocity header 2022-01-25 17:01:38 +05:30
Deepak Singh Gusain b3d5cd1e18 Fixed header ui issue 2022-01-25 16:02:17 +05:30
Glenn Hermans 3b8875dd53
Merge pull request #5679 from deepaksinghgusain227/image-review 
Fixed Image issue customer review tab in velocity theme
 2022-01-24 12:06:09 +01:00
Devansh 46da27f89e Added Missed JS File 2022-01-24 15:22:41 +05:30
Deepak Singh Gusain 410f232328 Fixed Image issue customer review tab in velocity theme 2022-01-24 11:52:41 +05:30
Deepak Singh Gusain b42bf8fa45 fixed datagrid issue at Velocity theme 2022-01-19 17:03:06 +05:30
Devansh 3b680fc98b
Merge pull request #5638 from devansh-webkul/fixed-cart-alignment 2022-01-18 16:16:41 +05:30