Commit Graph

317 Commits

Author SHA1 Message Date
merdan a09e244c16 composer update 2022-07-26 10:44:04 +05:00
merdan ae72375120 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.json
	composer.lock
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
2022-07-25 16:09:17 +05:00
merdan a4b1fe4840 Revert "server-folder-permissions"
This reverts commit a8c31e1a44.
2022-07-25 15:49:44 +05:00
Devansh Bawari 062145eed4 DOM PDF Updated 2022-07-19 09:48:49 +05:30
merdan 9e447b7584 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-07-05 15:24:50 +05:00
Devansh f812db03cd Config Added 2022-06-08 16:21:46 +05:30
Your Name a8c31e1a44 server-folder-permissions 2022-05-13 16:01:33 +05:00
merdan 694634fbab sarga filters 2022-05-07 15:40:52 +05:00
merdan 365a7704c3 sarga filters 2022-05-05 19:02:16 +05:00
merdan be56b923ec sarga filters 2022-05-05 18:35:14 +05:00
merdan 3d34d4ff76 sarga filters 2022-05-05 16:22:57 +05:00
merdan c695d66b97 sarga filters 2022-05-05 16:13:33 +05:00
merdan 5d6bb473a8 sarga filters 2022-05-05 16:10:48 +05:00
merdan 9607ebe1d7 sarga filters 2022-05-05 16:08:10 +05:00
merdan 1c2a9310cb sarga filters 2022-05-05 16:00:08 +05:00
merdan 1213d51541 sarga filters 2022-05-05 15:51:09 +05:00
merdan f7f5d7bf31 sarga filters 2022-05-05 14:33:36 +05:00
merdan 39f0fe2559 sarga filters 2022-05-05 14:26:14 +05:00
merdan 26d22624ca websockets 2022-04-24 15:23:53 +05:00
merdan e932006d71 websockets 2022-04-24 15:02:10 +05:00
merdan 264a153a9e websockets 2022-04-24 14:46:32 +05:00
merdan 77c6117a64 websockets 2022-04-24 14:36:55 +05:00
merdan 60abadb0c7 websockets 2022-04-24 14:35:19 +05:00
merdan 73648c6b37 websockets 2022-04-24 13:02:47 +05:00
merdan 214a1a11c0 websockets 2022-04-24 12:50:27 +05:00
merdan 3f5323dce3 vendors 2022-04-13 19:55:45 +05:00
merdan 4aaf2867c6 active brands 2022-04-12 13:50:55 +05:00
merdan cea1f4126c fix mix 2022-04-06 13:52:55 +05:00
merdan d9215d7220 commit 2022-04-06 13:48:23 +05:00
merdan 0c4a6e220c superattrbt 2022-04-06 11:31:40 +05:00
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 ed1e0a5fe8 Issue #5960 fixed 2022-04-01 17:20:09 +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 6df5fc0123 Remove stubs folder 2022-03-23 19:00:25 +05:30
jitendra 1b7a7ce7ba Issue #5963 fixed (Upgraded to Laravel 9) 2022-03-23 18:58:30 +05:30
merdan d3409841b9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-17 16:36:07 +05:00
jitendra 0080ca42c0 Updated changelog, fixed bagisto version display issue 2022-03-17 12:59:58 +05:30
Devansh 3927800bce Notification Fixed 2022-03-15 17:32:03 +05:30
merdan 241f39b99d payment adn super attributes 2022-02-28 14:19:57 +05:00
merdan 6b4d3d6466 Merge branch 'dev' into sarga-v1 2022-02-05 14:28:26 +05:00
merdan ece2b58d60 scrap fix 2022-02-04 15:48:26 +05:00
merdan 3ccddbf443 category filters 2022-02-03 13:34:16 +05:00
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
merdan a382281765 auth profile 2022-01-25 18:38:24 +05:00
merdan ec627b1264 brand start 2022-01-25 11:54:15 +05:00
Devansh 97c9bdd7d1 Default Argument To .env Added 2022-01-20 15:14:26 +05:30
Devansh 0c486dcf61 Lock File Updated And Squashed All Commits 2022-01-11 18:52:47 +05:30
Devansh fff092adf4 Version Improvement 2022-01-07 11:11:50 +05:30
Deepak Singh Gusain 38306a444d New Theme Work Done 2021-12-30 19:00:13 +05:30
merdiano 296f09d424 vendor categories 2021-12-29 08:05:55 +05:00