Commit Graph

4823 Commits

Author SHA1 Message Date
Pranshu Tomar 755d97ef16 Updated changelog file 2020-03-20 15:51:48 +05:30
Pranshu Tomar af1846a814 Issue #2707 fixed 2020-03-20 15:46:42 +05:30
Jitendra Singh 28f1ab7afe Merged with master 2020-03-19 19:18:59 +05:30
Jitendra Singh 792720354f Version updated 2020-03-19 19:04:33 +05:30
Jitendra Singh c501a1c2be Updated changelog file 2020-03-19 18:55:36 +05:30
Jitendra Singh 68853bf955 Updated changelog file 2020-03-19 18:40:20 +05:30
Jitendra Singh deda73af48 Issue #2594 fixed 2020-03-19 17:07:46 +05:30
Jitendra Singh 5902f0050c
Merge pull request #2681 from vivek-webkul/patch-41
[Updated: Shop & admin email setting added in configuration.]
2020-03-19 15:36:27 +05:30
Jitendra Singh 0a595fc0d8
Merge pull request #2694 from Haendlerbund/missing-relations
introduce cart belongsTo Relation in Order Model
2020-03-19 14:33:35 +05:30
Herbert Maschke c76c7a1d88 introduce cart belongsTo Relation in Order Model 2020-03-19 08:17:29 +01:00
Jitendra Singh 7faf5bb97f
Merge pull request #2690 from rahulshukla-webkul/development
Issue #2549
2020-03-18 18:52:02 +05:30
rahul shukla 7174ccbfd0 Issue #2549 2020-03-18 18:48:02 +05:30
Jitendra Singh 18c790b232
Merge pull request #2689 from rahulshukla-webkul/development
Issue #2637 fixed
2020-03-18 17:32:08 +05:30
Jitendra Singh 001262e6de
Merge pull request #2688 from jitendra-webkul/1.0
Issue #2518 fixed
2020-03-18 17:19:27 +05:30
Jitendra Singh 893564977f Issue #2518 fixed 2020-03-18 17:15:44 +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
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
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