Commit Graph

7168 Commits

Author SHA1 Message Date
jitendra 67fc98db83 Conflicts resolved 2020-11-09 17:02:00 +05:30
jitendra f65c0c22a8 Updated typo for paypal label and changed the default sort order for payment methods 2020-11-09 17:00:25 +05:30
Jitendra Singh 2e8c26b606
Merge pull request #4243 from mo7amedmamdouh/bugfix/fix-rtl-carousel-slider
Bugfix carousel RTL
2020-11-09 16:03:32 +05:30
Mohamed Mamdouh d1e1cbbc89 Bugfix - correctly inject direction prob to slider 2020-11-09 11:58:14 +02:00
Mohamed Mamdouh 8a74a22325 Bugfix carousel RTL 2020-11-08 17:34:11 +02:00
Jitendra Singh 40f7e89b60
Merge pull request #4236 from devansh-webkul/issue-4234
Fixed default values are not working in system configuration #4234
2020-11-06 20:21:15 +05:30
devansh bawari 40bde1a95d Merge remote-tracking branch 'upstream/master' into issue-4234
Merged With Master
2020-11-06 15:54:19 +05:30
devansh bawari 03a1f44def Default Value Added 2020-11-06 15:53:44 +05:30
Jitendra Singh 4ed2df4814
Merge pull request #4231 from vishal-webkul/issue-4229
Issue #4229 Fixed
2020-11-05 20:25:47 +05:30
Jitendra Singh 555910844d
Merge pull request #4232 from devansh-webkul/issue-4136
Wishlist check added in header #4136
2020-11-05 20:25:12 +05:30
devansh bawari 8534e55d0b Added In Responsive 2020-11-05 19:10:46 +05:30
vishal.kushwaha650 e03fab4d0c Issue #4229 Fixed 2020-11-05 18:18:05 +05:30
Jitendra Singh 63ad620ec8
Merge pull request #4227 from devansh-webkul/issue-4212
Fixed error uninstall developer dependencies going into production mode #4212
2020-11-04 19:09:03 +05:30
devansh bawari c1ed893bdf Barry Debugger Dependency Set 2020-11-04 14:40:00 +05:30
Glenn Hermans a0970f590d
Merge pull request #4153 from jaseelbavu/issue-4082
Added bulk category delete functionality
2020-11-02 17:16:33 +01:00
Jaseel P V 0de1f9e64b Added check for products in individual category delete | Fixed bug while selecting category for mass delete 2020-11-02 20:32:25 +05:30
Jitendra Singh e9591f6c0f
Merge pull request #4224 from jitendra-webkul/master
Removed commented code from paypal smart button controller
2020-11-02 17:36:33 +05:30
jitendra fdd6bca458 Removed commented code from paypal smart button controller 2020-11-02 17:36:04 +05:30
Jitendra Singh d6201b3c11
Merge pull request #4223 from jitendra-webkul/master
Paypal smart button issue fixed
2020-11-02 17:34:27 +05:30
jitendra 3cd5344448 Paypal smart button issue fixed 2020-11-02 17:33:57 +05:30
Jitendra Singh 9de3a335b2
Merge pull request #4183 from devansh-webkul/issue-4181
Minimum Height Added #4181
2020-11-02 15:00:33 +05:30
Jitendra Singh 76f4db6adf
Merge pull request #4213 from asif-webkul/issue4127
fixed Issue  #4127
2020-11-02 14:20:51 +05:30
Jitendra Singh ac2ee68504
Merge pull request #4221 from devansh-webkul/issue-4220
Duplicated Images Removed #4220
2020-11-02 13:27:32 +05:30
Jitendra Singh 56159902d1
Merge pull request #4222 from devansh-webkul/dummy-1
Added regular price when sale price is added
2020-11-02 13:14:42 +05:30
devansh bawari f5d1eeb426 Removed From Velocity Assets Images 2020-11-02 13:02:36 +05:30
devansh bawari 8fbb1faea3 Just Final Step Finishing 2020-11-02 12:25:29 +05:30
Jitendra Singh b6dbdef04a
Merge pull request #4210 from rahulcs0082/development
Development
2020-11-02 12:24:56 +05:30
devansh bawari 549df39875 Merge branch 'master' into dummy-1
Merged With Master
2020-11-02 12:12:44 +05:30
devansh bawari 383edab8b5 Duplicated Images Removed 2020-11-02 11:59:21 +05:30
devansh bawari aa3ba2d24f Recompiled 2020-11-02 10:13:08 +05:30
devansh bawari b1cf108f11 Merge branch 'master' into issue-4181 2020-11-02 10:12:25 +05:30
mohd asif 620c687683 Merge branch 'master' of https://github.com/bagisto/bagisto into issue4127 2020-11-01 11:39:49 +05:30
mohd asif 4f91ccf028 fixed issue #4127 2020-11-01 11:38:17 +05:30
Glenn Hermans 431f361082
Merge pull request #4204 from devansh-webkul/issue-4178
Quick View Icon Glitch Fixed #4178
2020-10-30 16:49:36 +01:00
devansh bawari 5aebd1b4e8 Merge branch 'master' into dummy-1
Merged With Master
2020-10-30 21:05:59 +05:30
devansh bawari fcac81c0d4 Recompiled 2020-10-30 21:01:12 +05:30
devansh bawari 6ff6b325d6 Merge branch 'master' into issue-4181 2020-10-30 21:00:38 +05:30
devansh bawari 9eff166437 Recompiled 2020-10-30 20:59:31 +05:30
devansh bawari 2daf78ac4e Merge branch 'master' into issue-4178 2020-10-30 20:58:59 +05:30
Glenn Hermans 5529fcad1e
Merge pull request #4157 from praem90/ISSUE_4111
Hide horizontal scrollbar on the sidebar
2020-10-30 15:47:24 +01:00
Mohan Raj df383e4323 Merge branch 'master' of https://github.com/bagisto/bagisto into ISSUE_4111 2020-10-30 20:08:56 +05:30
Glenn Hermans bcfe391277
Merge pull request #4159 from praem90/ISSUE_4081
add validation for discount amt field in customer group price
2020-10-30 15:12:37 +01:00
Glenn Hermans 42410fc2b7
Merge pull request #4208 from devansh-webkul/issue-4180
Some Minor Issue Fixed #4180
2020-10-30 15:09:20 +01:00
Glenn Hermans 5aaa80e100
Merge pull request #4177 from prateek-webkul/master
issue #4079 fixed
2020-10-30 14:42:47 +01:00
rahulshukla-home ce90a569f3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 18:22:39 +05:30
rahulshukla-home 30f9179439 removed unnecessary code in export controller 2020-10-30 18:21:39 +05:30
devansh bawari fa1932e333 Modal Issue Fixed 2020-10-30 17:36:31 +05:30
devansh bawari 43457b225e Merge remote-tracking branch 'dummy/patch-1' into dummy-1
Merged
2020-10-30 17:04:18 +05:30
devansh bawari 538f5b71fa Little Change And Recompiled 2020-10-30 16:44:56 +05:30
devansh bawari 6ee60ad355 Merge branch 'master' into issue-4178 2020-10-30 16:34:20 +05:30