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

7861 Commits

Author SHA1 Message Date
Poghos bd4ec58f58 Merge branch 'master' of github.com:bagisto/bagisto into patch-1 2021-01-26 12:25:01 +04:00
Poghos a6cacb93da Added checking for the route existence for Bundle, Downloadable, Grouped types. 2021-01-25 18:32:26 +04:00
Poghos Boyajyan 203483a5c0
Added checking for the route existence in request 2021-01-25 18:13:40 +04:00
Poghos Boyajyan beb1fbf409
Added checking for the route existence in request 2021-01-25 17:59:52 +04:00
Poghos Boyajyan c7411ce00b
Added checking for the route existence in request 2021-01-25 17:58:43 +04:00
devansh bawari 447e095d0e Merge branch 'master' into issue-4510 2021-01-22 19:15:48 +05:30
rahul shukla 05597e3225 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-22 17:38:27 +05:30
rahul shukla b3b1dadca9 Issue #fixes as per comment 2021-01-22 17:38:00 +05:30
Glenn Hermans 2b4ca622b4
Merge pull request #4499 from devansh-webkul/issue-4498 
Category checked by ID #4498
 2021-01-22 13:04:13 +01:00
devansh bawari 8b74d496e3 API Updated 2021-01-22 17:28:15 +05:30
Jitendra Singh 42e730e42f
Merge pull request #4514 from devansh-webkul/issue-4513 
Fixed customer group column name which is invalid in csv, xls file #4513
 2021-01-22 13:31:47 +05:30
devansh bawari 0bd2762da9 Comments Updated 2021-01-22 13:25:49 +05:30
devansh bawari 44374fd349 Mass Delete Check Added 2021-01-22 13:08:12 +05:30
devansh bawari b0a86594fe Name Changed 2021-01-22 12:20:15 +05:30
devansh bawari b81c91e3b2 Typo Fixed 2021-01-22 11:17:25 +05:30
devansh bawari 6879605b52 Channel Root Category IDs Check Added 2021-01-22 11:15:53 +05:30
devansh bawari 7f378bc914 Merge remote-tracking branch 'upstream/master' into issue-4498 2021-01-22 11:06:36 +05:30
Glenn Hermans 9fc76b90ad
Merge pull request #4509 from devansh-webkul/issue-4506 
Customer group pricing fixed discount now accept decimal values #4506
 2021-01-22 05:57:00 +01:00
Glenn Hermans 6c2f6c533d
Merge pull request #4512 from devansh-webkul/master 
Resources Path Removed From Marketing Provider
 2021-01-21 15:19:16 +01:00
devansh bawari 236cfe4fd1 Remove 1 Line And Sorted Imports 2021-01-21 19:40:38 +05:30
devansh bawari bc95c19d6a Removed From Marketing Provider 2021-01-21 19:36:57 +05:30
rahul shukla b6639ab0eb did the required changes 2021-01-21 13:56:32 +05:30
devansh bawari a4e610ce53 Merge branch 'master' into issue-4506 2021-01-21 12:33:38 +05:30
devansh bawari 3242e591ab Step Added 2021-01-21 11:48:48 +05:30
rahul shukla 54002459f3 Issue #3572 done 2021-01-20 20:55:12 +05:30
Glenn Hermans f3d638b763
Merge pull request #4502 from bagisto/dependabot/composer/laravel/framework-7.30.3 
Bump laravel/framework from 7.30.2 to 7.30.3
 2021-01-20 16:08:13 +01:00
Glenn Hermans c760d76e28
Merge pull request #4503 from rahulshukla-webkul/development 
Development
 2021-01-20 16:06:53 +01:00
Glenn Hermans 0ff6093306
Merge pull request #4501 from devansh-webkul/issue-4500 
Fixed unnecessary gap in between sliders and products in mobile view (Default Theme) #4500
 2021-01-20 12:07:06 +01:00
rahul shukla 4ba2ed0e3b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-20 15:00:51 +05:30
rahul shukla ed1ae6aed5 Issue #4435 and #4436 2021-01-20 15:00:37 +05:30
dependabot[bot] c0f633e5e7
Bump laravel/framework from 7.30.2 to 7.30.3 
Bumps [laravel/framework](https://github.com/laravel/framework) from 7.30.2 to 7.30.3.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-6.x.md)
- [Commits](https://github.com/laravel/framework/compare/v7.30.2...v7.30.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-20 09:28:19 +00:00
Glenn Hermans 18111309a5
Merge pull request #4422 from devansh-webkul/vul-issue 
Vulnerability Fixed For PHP Office
 2021-01-20 10:23:43 +01:00
devansh bawari 6d788b096a Merge branch 'master' into vul-issue 2021-01-20 14:21:01 +05:30
devansh bawari 01f6ff496b Merge branch 'master' into issue-4498 2021-01-20 14:14:44 +05:30
devansh bawari 1807451477 Merge remote-tracking branch 'upstream/master' 2021-01-20 13:45:01 +05:30
devansh bawari 01bcc22c42 Slider Space Fixed 2021-01-20 13:44:24 +05:30
Glenn Hermans 76debfbe8b
Merge pull request #4497 from devansh-webkul/ignored-files-and-clean-up 
Ignored files and clean up
 2021-01-19 15:32:18 +01:00
Jitendra Singh 59a239445b
Merge pull request #4496 from dev-smlee/master 
fix typo
 2021-01-19 19:33:21 +05:30
devansh bawari 04c693fc4f Category Checked By ID 2021-01-19 14:38:37 +05:30
devansh bawari cd94346364 Merge remote-tracking branch 'upstream/master' into ignored-files-and-clean-up 2021-01-19 13:26:04 +05:30
devansh bawari 0b7475c2bb Some Cleanups And Ignored Files 2021-01-19 13:24:20 +05:30
andy cdd037e0ae fix typo 2021-01-19 16:09:53 +09:00
Glenn Hermans 775ab910d1
Added missed condition in marketing 2021-01-18 18:02:42 +01:00
rahul shukla 9f67e46ef8 added missed condition in marketing 2021-01-18 20:13:46 +05:30
Glenn Hermans 5b52af7c67
Merge pull request #4488 from rahulshukla-webkul/development 
Issue #4432 fixed
 2021-01-18 14:22:47 +01:00
devansh bawari 1fd9b6fa87 Merge branch 'master' into vul-issue 2021-01-18 18:51:17 +05:30
rahul shukla e61d89a3d0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-18 16:24:09 +05:30
rahul shukla 142f04ad41 fixing as per comment 2021-01-18 16:23:53 +05:30
Glenn Hermans 2b276acd55
Merge pull request #4493 from devansh-webkul/temp-fix 
Manual Require Added Till Merging Of Autoloading Fix #4420
 2021-01-18 10:59:48 +01:00
devansh bawari 99f797c814 Manual Require Added 2021-01-18 10:51:32 +05:30