Commit Graph

3534 Commits

Author SHA1 Message Date
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +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
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
Vivek e1ed114d74 [Updated: Core/Config.php modified.] 2020-03-16 13:13:57 +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
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
Jitendra Singh 7182400059 Issue #2658 fixed 2020-03-16 11:02:14 +05:30
Jitendra Singh 7072a60cda
Merge pull request #2657 from jitendra-webkul/1.0
Issue #2654 fixed
2020-03-13 19:16:48 +05:30
Jitendra Singh 7413e1577e Issue #2654 fixed 2020-03-13 19:15:59 +05:30
Jitendra Singh 65b34add4b
Merge pull request #2656 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:08:08 +05:30
Jitendra Singh e38a95cb3f Catalog price rule issue fixed if discounted and normal price is same 2020-03-13 19:07:14 +05:30
Jitendra Singh cae24088da
Merge pull request #2655 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:04:20 +05:30
Jitendra Singh 4e10d706f5 Catalog price rule issue fixed if discounted and normal price is same 2020-03-13 19:03:19 +05:30
Jitendra Singh 195344e8a2
Merge pull request #2653 from jitendra-webkul/1.0
Issue #2638 fixed
2020-03-13 18:31:15 +05:30
Jitendra Singh 9b60f0b8ec Issue #2638 fixed 2020-03-13 17:51:46 +05:30
Jitendra Singh 46ab49c489
Merge pull request #2652 from jitendra-webkul/1.0
Issue #2649 fixed
2020-03-13 17:43:57 +05:30
Jitendra Singh fd15942132 Issue #2649 fixed 2020-03-13 17:37:25 +05:30
Jitendra Singh c0f174e86b
Merge pull request #2651 from jitendra-webkul/1.0
Issue #2650 fixed
2020-03-13 17:21:36 +05:30
Jitendra Singh ef7dac9fec Issue #2650 fixed 2020-03-13 17:04:00 +05:30
Jitendra Singh 3a9fbbaff3
Merge pull request #2648 from jitendra-webkul/1.0
Issue #2643 fixed
2020-03-13 16:47:43 +05:30
Jitendra Singh fbf4ffa1c3 Issue #2643 fixed 2020-03-13 16:42:04 +05:30
Jitendra Singh c2633d06c0
Merge pull request #2647 from jitendra-webkul/1.0
Issues #2634, #2635 fixed
2020-03-13 12:56:41 +05:30
Jitendra Singh 557e619bdc Issues #2634, #2635 fixed 2020-03-13 12:52:26 +05:30
Jitendra Singh 30f94375f3
Merge pull request #2631 from Haendlerbund/show-multiple-flash-messages-in-admin-panel
bugfix: show multiple flash messages in admin panel
2020-03-12 14:53:46 +05:30
Jitendra Singh 00f8f7ddb0 Issue #2630 fixed 2020-03-11 16:45:06 +05:30
Jitendra Singh ec3be668b6 Issue #2630 fixed 2020-03-11 15:36:45 +05:30
Annika Wolff 04c35bb88d uncommented factory loading in TaxServiceProvider, bc. tests will miss it 2020-03-11 11:06:17 +01:00
Annika Wolff 65b5ec9232 bugfix: show multiple flash messages in admin panel 2020-03-11 10:45:18 +01:00
Jitendra Singh 6063c113bf Removed static text from shop datagrid 2020-03-11 12:15:03 +05:30
Vivek Sharma ffd918af20 [Updated: Changed Velocity's models related code.] 2020-03-07 11:43:22 +05:30
Jitendra Singh 5859d8dfc2
Merge pull request #2625 from jitendra-webkul/booking-product
Remove static text from grid
2020-03-06 20:06:21 +05:30