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

1847 Commits

Author SHA1 Message Date
merdan 4c1d795e1a Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-10 13:53:15 +05:00
Sanjay f9cac3a0c0 Hindi-locale-added 2022-03-09 18:51:25 +05:30
merdan 88639941d4 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-04 16:09:33 +05:00
jitendra cef2d657c0 Issue #5932 fixed 2022-03-04 11:54:55 +05:30
merdan cf740f86c7 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-02-28 17:06:59 +05:00
prateek srivastava 5c0f05f209 issue #5729 fixed 2022-02-28 15:32:27 +05:30
merdan e2c55597b1 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-02-28 14:20:24 +05:00
Sanjay e8e199c7be Issue #5887 Fixed 2022-02-28 13:41:00 +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 d751a96b02 Remove static text from default theme 2022-02-22 15:03:22 +05:30
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 94bd8e1a20 css added on scss file 2022-02-21 17:37:48 +05:30
Sanjay 7aef650d37 inline css removed 2022-02-21 17:36:05 +05:30
Sanjay d0ce1761d6 css updated for eye icon 2022-02-21 17:03:41 +05:30
Sanjay dc2d283616 Show-password-option-added-default-theme 2022-02-21 16:47:40 +05:30
Sanjay a0b5f80cec Enhancement done #5817 2022-02-16 12:09:50 +05:30
Devansh 673d063b37 Merge remote-tracking branch 'upstream/master' into review-issue 2022-02-19 18:24:07 +05:30
Devansh 96c45aaf8b Merge branch 'master' into review-issue 2022-02-19 18:22:00 +05:30
Devansh e023aa7060 Cart UI Issue 2022-02-15 13:56:48 +05:30
Devansh 77d741cc87 Review Issue Fixed 2022-02-15 11:09:38 +05:30
Devansh 187e7d816d Merge branch 'master' into s3-image-cache 2022-02-15 09:27:28 +05:30
Devansh 9d99fdf186 All Destroy Method Updated 2022-02-11 18:04:38 +05:30
Devansh 315d02d087 Merge branch 'master' into s3-image-cache 2022-02-11 11:51:35 +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
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 36c013d1a8 Fixed back button issue at bliss theme 2022-02-04 17:11:13 +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
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
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
Devansh 22933b19a5 Merge branch 'master' into optional-fields-checkout 2022-02-03 18:32:42 +05:30
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
Devansh ff1f77fe8e Suspend Customer Ability Added In Admin 2022-02-02 15:47:09 +05:30
Deepak Singh Gusain 3e5d6155a4 Fixed Downloadable customer panel header ui 2022-02-02 14:02:57 +05:30
Devansh c9b60b2c10 Squashed All Commits 2022-02-01 16:44:16 +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 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 1aa67104cc resolve conflicts and merge master 2022-01-25 13:57:27 +05:30
Devansh 0fe5b20bda
Merge pull request #5675 from akhtarkhan1/product-download 
–Fixed Download product issue #5663
 2022-01-25 13:29:57 +05:30
Deepak Singh Gusain ad1f1f5b26 Fixed ui issue of checkout biling addres 2022-01-25 12:55:13 +05:30
Deepak Singh Gusain c14ed6c012 Fixed camera icon mobile view at bliss theme 2022-01-25 11:43:30 +05:30