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

197 Commits

Author SHA1 Message Date
merdan cea1f4126c fix mix 2022-04-06 13:52:55 +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 bfbd64cb22 Issue #5399 fixed (Back to top button added) 2022-03-24 11:55:54 +05:30
jitendra 1b7a7ce7ba Issue #5963 fixed (Upgraded to Laravel 9) 2022-03-23 18:58:30 +05:30
merdan 241f39b99d payment adn super attributes 2022-02-28 14:19:57 +05:00
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
dependabot[bot] 3e44fe6636
Bump enshrined/svg-sanitize from 0.14.1 to 0.15.0 
Bumps [enshrined/svg-sanitize](https://github.com/darylldoyle/svg-sanitizer) from 0.14.1 to 0.15.0.
- [Release notes](https://github.com/darylldoyle/svg-sanitizer/releases)
- [Commits](https://github.com/darylldoyle/svg-sanitizer/compare/0.14.1...0.15.0)

---
updated-dependencies:
- dependency-name: enshrined/svg-sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 00:45:26 +00: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 ec627b1264 brand start 2022-01-25 11:54:15 +05:00
Devansh 0c486dcf61 Lock File Updated And Squashed All Commits 2022-01-11 18:52:47 +05:30
Deepak Singh Gusain 38306a444d New Theme Work Done 2021-12-30 19:00:13 +05:30
AmooAti d5b1fb259d update all dependencies and compatible with PHP 8.1 2021-12-12 00:40:50 +03:30
merdan 02aa04969c Merge remote-tracking branch 'origin/sarga-v1' into sarga-v1 
# Conflicts:
#	README.md
#	composer.json
#	config/app.php
#	packages/Sarga/API/Http/Controllers/Products.php
#	packages/Sarga/API/Http/Resources/Catalog/Category.php
#	packages/Sarga/API/Http/routes.php
#	packages/Sarga/API/composer.json
#	packages/Sarga/Admin/src/Providers/AdminServiceProvider.php
#	packages/Sarga/Admin/src/Routes/settings-routes.php
 2021-12-04 22:33:58 +05:00
merdan c4cb807670 multivendor and category new slugs urls 2021-12-04 22:28:11 +05:00
Devansh 7c953c8aa3 Package Moved 2021-11-19 16:18:59 +05:30
Devansh f36275bf9f Packages Updated 2021-11-18 18:41:13 +05:30
merdan 2f835ea6b2 Bulk Demo Category Seeder 2021-11-15 19:15:20 +05:00
merdan 64525fcb0b Channels list with sliders 2021-11-15 19:09:14 +05:00
merdan a1125752df Git branch sarga rebased to master 2021-11-15 19:09:14 +05:00
merdan ca6ebf513a rebase 2021-11-15 19:08:56 +05:00
merdan e6e35032cb promotions and products 2021-11-09 22:55:21 +05:00
merdan ff94aa93db Channels list with sliders 2021-11-05 16:02:50 +05:00
merdan 06d5af9bed Git branch sarga rebased to master 2021-11-05 16:02:17 +05:00
merdan cc101c69fb Bulk Demo Category Seeder 2021-11-05 16:01:43 +05:00
Devansh b9ec59947a Added Breadcrumb And Yielding Done In Default Theme 2021-10-20 11:06:05 +05:30
Abdullah Al-Faqeir 7b612ecc67 - Fix trigger yaml file to user laravel instead of larave5. 
- Remove codeception/module-laravel5 as it was causing trigger testing to fail since it's outdated and we already upgraded factories to laravel 8.
 2021-10-05 12:37:21 +03:00
Abdullah Al-Faqeir 1320e493d2 - working on test cases. 
- update codeception driver for laravel.
 2021-10-04 16:35:47 +03:00
Abdullah Al-Faqeir 029b77df23 - Refactoring to Laravel 8 Class Model Factories. 2021-10-04 11:30:32 +03:00
Glenn Hermans d66f5526c6
Added support section for composer 2021-06-17 20:06:45 +02:00
Devansh e3817973e7 Dev Branch Added To Tymon Auth 2021-05-18 04:21:08 +00:00
devansh bawari 46d2484b70 Version Updated 2021-05-17 18:23:50 +05:30
devansh bawari f2617a7013 Dependency Updated 2021-05-17 17:57:49 +05:30
devansh bawari c71fa83b84 Test Case Portion 1 2021-04-13 17:28:51 +05:30
Devansh 97afaf7261 Merged 2021-03-31 05:11:15 +00:00
devansh bawari f16d9b0b91 Dependency Updated 2021-03-30 13:53:43 +05:30
devansh bawari ca85df8998 Reverted Some Code 2021-03-30 13:42:31 +05:30
devansh bawari a33f7428a9 Time Issue Fixed 2021-03-30 13:37:29 +05:30
devansh bawari 3f476bae52 Dependency Updated 2021-03-30 13:31:30 +05:30
devansh bawari 4cadfbc94d PHP 8 Support Added 2021-03-25 20:04:47 +05:30
devansh bawari e525e227ef Depedency Updated 2021-03-02 13:57:35 +05:30
devansh bawari c260103ec9 PHP Unit Set To 9.0 2021-02-26 14:29:15 +05:30
devansh bawari 972545d186 Dependency Updated 2021-02-26 14:11:55 +05:30
devansh bawari 69e8a06c00 Dependency Resolved 2021-02-25 12:46:36 +05:30
Khaled Al-Shamaa 4ee25f3a4d
Use the latest version of ar-php library 
Version 6.0.0 of the ar-php library fixed the issue of ignoring the punctuation marks when coming in the Arabic context for more robust segmentation using the "arIdentify" method. This will resolve the issue reported here by Fahad Khan:
https://github.com/bagisto/bagisto/pull/4462#issuecomment-765555768
 2021-02-15 16:26:05 +02:00
devansh bawari 72d94b7abc Manual Require Removed 2021-01-27 10:55:00 +05:30
devansh bawari 2d0c8562d8 Merge branch 'master' into vul-issue 2021-01-14 21:00:01 +05:30
devansh bawari 71abe8f4ca Arabic And Persian Support Added To DOM PDF 2021-01-08 20:23:01 +05:30