Commit Graph

7262 Commits

Author SHA1 Message Date
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
devansh bawari 233e87d7ef Some Work Done 2020-11-02 16:18: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
devansh bawari fef875a3a8 Recompiled 2020-11-02 10:08:39 +05:30
devansh bawari 02080db646 Merged With Master 2020-11-02 10:07:49 +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
devansh bawari 3b6623c9c9 Recompiled 2020-10-30 20:37:56 +05:30
devansh bawari 2d4e9f0e97 Merge branch 'master' into issue-3929 2020-10-30 20:37:10 +05:30
devansh bawari 0ac032c908 Carousel Product Issue Fixed 2020-10-30 20:34: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
devansh bawari a0b984a677 Removed Log 2020-10-30 19:41:10 +05:30
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
devansh bawari 865ae6c741 Featured Product Completed 2020-10-30 19:39:10 +05:30
Glenn Hermans 5aaa80e100
Merge pull request #4177 from prateek-webkul/master
issue #4079 fixed
2020-10-30 14:42:47 +01:00
devansh bawari 024799ad9f Merge branch 'master' into issue-3929 2020-10-30 18:38:41 +05:30
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
Glenn Hermans 6be2c6e22d
Merge pull request #4202 from devansh-webkul/issue-4105
Fixed issue with total due in cash on delivery #4105
2020-10-30 12:00:01 +01:00
devansh bawari 4035e4f892 Some Changes 2020-10-30 16:29:34 +05:30
Glenn Hermans 211b2c626c
Merge pull request #4207 from rahulcs0082/development
Development
2020-10-30 11:56:08 +01:00
rahulshukla-home cd6471d5b9 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 15:55:14 +05:30
rahulshukla-home e700917341 Issue #4142 fixed 2020-10-30 15:45:01 +05:30
rahulshukla-home 8f67f6cee5 Issue #3142 fixed 2020-10-30 15:43:30 +05:30
Glenn Hermans 139572921e
Merge pull request #3997 from vishal-webkul/issue-3975
Issue #3975 Fixed
2020-10-30 10:36:27 +01:00
Glenn Hermans dd37cf00a9
Merge pull request #4099 from devansh-webkul/velocity_responsive_issue
Velocity Responsive Issue #4195
2020-10-30 10:25:18 +01:00