Commit Graph

4808 Commits

Author SHA1 Message Date
rahul shukla 7174ccbfd0 Issue #2549 2020-03-18 18:48:02 +05:30
rahul shukla a0f17a1866 Issue #2637 fixed 2020-03-18 17:15:36 +05:30
Jitendra Singh 7ed5943642
Merge pull request #2687 from rahulshukla-webkul/development
Issue #2593 fixed
2020-03-18 16:33:16 +05:30
rahul shukla d9a391f1cc Issue #2593 fixed 2020-03-18 16:15:33 +05:30
Jitendra Singh 7b5930f8bc
Merge pull request #2686 from jitendra-webkul/1.0
Issue #2613 fixed
2020-03-18 14:54:31 +05:30
Jitendra Singh 663a679a5d
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
Order workflow improvements and tests
2020-03-18 14:50:48 +05:30
Jitendra Singh bc39a19f49 Issue #2613 fixed 2020-03-18 14:50:20 +05:30
Jitendra Singh 3002723e78
Merge pull request #2683 from phillipcodes/patch-1
Fix cart discount naming in API
2020-03-18 13:41:12 +05:30
Jitendra Singh 45ce9b03db
Merge pull request #2685 from jitendra-webkul/1.0
Issue #2677 fixed
2020-03-18 13:34:29 +05:30
Jitendra Singh 17abfdb1d6 Issue #2677 fixed 2020-03-18 13:24:12 +05:30
Herbert Maschke 985d5bfb2e Unfortunately it does _not_ yet fix the bug. Release the lock of
codeception later when fixed...

This reverts commit 4f375648cc.
2020-03-18 08:09:05 +01:00
Herbert Maschke 4f375648cc remove lock of codeception to 4.1.1 (4.1.3 has been released yesterday which fixes the bug) 2020-03-18 08:05:19 +01:00
phillipcodes 7fdc8fd4a6
Update Cart.php 2020-03-17 15:05:00 +01:00
Herbert Maschke e6c3fb050c lock codeception to 4.1.1 2020-03-17 14:33:48 +01:00
Herbert Maschke fd096e7248 stay on phpunit 7.x for a while... 2020-03-17 14:24:36 +01:00
Jitendra Singh 659745ee70
Merge pull request #2680 from shubhwebkul/velocity-updated
misc. updates
2020-03-17 15:53:55 +05:30
shubhammehrotra.symfony@webkul.com e96c6011e0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-03-17 15:48:29 +05:30
shubhammehrotra.symfony@webkul.com c06aeadb37 product add to cart issue resolved on PDP 2020-03-17 15:48:10 +05:30
Jitendra Singh 279ab5b237
Merge pull request #2679 from jitendra-webkul/1.0
Issue #2669 fixed
2020-03-17 15:38:48 +05:30
Jitendra Singh d76a8d8dec Issue #2669 fixed 2020-03-17 15:34:33 +05:30
shubhammehrotra.symfony@webkul.com d5b1e84fdb #2678 2020-03-17 14:00:07 +05:30
shubhammehrotra.symfony@webkul.com 32701de737 #2666 2020-03-17 13:34:44 +05:30
shubhammehrotra.symfony@webkul.com ca4ae665f1 #2667 2020-03-17 13:13:24 +05:30
Jitendra Singh 8ac4946352
Merge pull request #2676 from jitendra-webkul/1.0
Issue #2671 fixed
2020-03-17 13:02:41 +05:30
Jitendra Singh cdc1eb7bc1 Issue #2671 fixed 2020-03-17 13:01:37 +05:30
Jitendra Singh df9611d030
Merge pull request #2673 from jitendra-webkul/1.0
Issue #2672 fixed
2020-03-17 12:26:23 +05:30
Jitendra Singh bf5ad13dac Issue #2672 fixed 2020-03-17 12:25:04 +05:30
shubhammehrotra.symfony@webkul.com f354d0aafa shimmer effect added in wishlist and comparison 2020-03-17 11:44:22 +05:30
Jitendra Singh 291a1acb0e
Merge pull request #2668 from shubhwebkul/velocity-updated
misc. updates
2020-03-16 19:07:54 +05:30
shubhammehrotra.symfony@webkul.com ce90035edb hide compare, wishlist icon 2020-03-16 18:52:37 +05:30
shubhammehrotra.symfony@webkul.com d83bc00289 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-03-16 18:47:10 +05:30
shubhammehrotra.symfony@webkul.com 61f949f43e #2646 2020-03-16 18:46:56 +05:30
shubhammehrotra.symfony@webkul.com bc362144c3 added shimmer effect product cards 2020-03-16 16:33:53 +05:30
Jitendra Singh 1eb1954a4f
Merge pull request #2665 from shubhwebkul/velocity-updated
misc. bug fixes
2020-03-16 15:10:48 +05:30
shubhammehrotra.symfony@webkul.com cc12549336 #2636 2020-03-16 13:40:21 +05:30
shubhammehrotra.symfony@webkul.com ee4f81004c #2639 2020-03-16 13:34:01 +05:30
Jitendra Singh 9da4421b66
Merge pull request #2664 from vivek-webkul/patch-40
[Updated: Core/Config.php modified.]
2020-03-16 13:21:27 +05:30
Vivek e1ed114d74 [Updated: Core/Config.php modified.] 2020-03-16 13:13:57 +05:30
shubhammehrotra.symfony@webkul.com 405d484619 merged with master 2020-03-16 13:10:34 +05:30
shubhammehrotra.symfony@webkul.com 78abd34cac merged with master 2020-03-16 13:08:40 +05:30
Jitendra Singh c5834c08b6
Merge pull request #2663 from rahulshukla-webkul/development
Issue #2644 fixed
2020-03-16 12:55:03 +05:30
rahul shukla 105bc70ef0 Issue #2644 fixed 2020-03-16 12:28:22 +05:30
Jitendra Singh 96ab5e390e
Merge pull request #2662 from jitendra-webkul/1.0
Issue #2660 fixed
2020-03-16 11:57:51 +05:30
Jitendra Singh 282545e1c4 Issue #2660 fixed 2020-03-16 11:53:39 +05:30
Jitendra Singh e258ce2b81
Merge pull request #2627 from vivek-webkul/patch-39
[Updated: Changed Velocity's models related code.]
2020-03-16 11:26:57 +05:30
Vivek 1572075443 [Updated: worked on conflict.] 2020-03-16 11:10:07 +05:30
Jitendra Singh 355a6a5c5d
Merge pull request #2659 from jitendra-webkul/1.0
Issue #2658 fixed
2020-03-16 11:03:00 +05:30
Vivek c9062abd1f [Updated: resolved config/concord.php conflict.] 2020-03-16 11:02:51 +05:30
Jitendra Singh 7182400059 Issue #2658 fixed 2020-03-16 11:02:14 +05:30
Vivek fcbaec6676 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:58:27 +05:30