Commit Graph

3850 Commits

Author SHA1 Message Date
Jitendra Singh ddc420c1c1
Merge pull request #2065 from shubhwebkul/velocity
Bagisto theme added
2020-01-25 12:40:49 +05:30
shubhammehrotra.symfony@webkul.com 221aa5ba66 updates from bagisto 2020-01-24 19:03:22 +05:30
shubhammehrotra.symfony@webkul.com 3f377c929e Merge branch 'master' of https://github.com/bagisto/bagisto into velocity 2020-01-24 18:52:45 +05:30
Jitendra Singh f4ee571dc7
Merge pull request #2127 from Haendlerbund/basic-backend-tests
add basic backend tests
2020-01-24 18:50:50 +05:30
shubhammehrotra.symfony@webkul.com 80ef6e8820 responsive updates 2020-01-24 18:49:50 +05:30
Jitendra Singh cb45802acd
Merge pull request #2135 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-24 16:49:14 +05:30
Jitendra Singh eec113ad80 Resolve conflict 2020-01-24 16:48:30 +05:30
Jitendra Singh 195a37fea3 Issue #1779 fixed 2020-01-24 16:44:45 +05:30
Jitendra Singh 00bed27d49
Merge pull request #2134 from jitendra-webkul/1.0
Issue #2124 fixe
2020-01-24 16:17:41 +05:30
Jitendra Singh f80109ba8b Issue #2124 fixed 2020-01-24 16:11:17 +05:30
Jitendra Singh 6068dda972
Merge pull request #2133 from rahulshukla-webkul/development
Issue #2132
2020-01-24 15:00:06 +05:30
rahul shukla d0dfa3fe9e Issue #2132 2020-01-24 14:39:11 +05:30
Jitendra Singh 4a38df3279 Fixed letter case issue in translation 2020-01-24 14:04:29 +05:30
Jitendra Singh d8f17634ca
Merge pull request #2131 from jitendra-webkul/1.0
Issue #2128 fixed
2020-01-24 14:01:39 +05:30
Jitendra Singh 13ed511070
Merge pull request #2130 from rahulshukla-webkul/development
condtion added for bundle product while adding cart
2020-01-24 13:59:14 +05:30
Jitendra Singh d1ab679e3e Issue #2128 fixed 2020-01-24 13:54:54 +05:30
Jitendra Singh d5c0891055 Issue #2128 fixed 2020-01-24 13:50:40 +05:30
rahul shukla e71d0035fe condtion added for bundle product while adding cart 2020-01-24 11:54:47 +05:30
Jitendra Singh cd51985a9e
Merge pull request #2129 from rahulshukla-webkul/development
Issue #2088
2020-01-23 20:00:16 +05:30
rahul shukla 8548884d3e removed dd 2020-01-23 19:49:41 +05:30
rahul shukla 259f5a8c00 Issue #2088 2020-01-23 19:43:03 +05:30
Florian Bosdorff db00689a5c add basic backend tests 2020-01-23 13:11:47 +01:00
Jitendra Singh 5a63b48332
Merge pull request #2125 from rahulshukla-webkul/development
try and catch in password section and wishlist add remove
2020-01-23 16:07:30 +05:30
rahul shukla 2c0b7e4e54 try and catch in password section and wishlist add remove 2020-01-23 15:32:06 +05:30
Jitendra Singh 956259cc32
Merge pull request #2123 from rahulshukla-webkul/development
Issue #2087
2020-01-23 11:51:19 +05:30
Jitendra Singh da4980bfbe
Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration
Issue 1183/guest checkout configuration
2020-01-23 11:51:08 +05:30
rahul shukla 6147c3e5db Issue #2114 2020-01-23 11:01:04 +05:30
rahul shukla 2d8f5f412e Issue #2087 2020-01-23 10:42:09 +05:30
shubhammehrotra.symfony@webkul.com a826937b98 responsive updates 2020-01-22 21:23:20 +05:30
Jitendra Singh 2c618d7856
Merge pull request #2122 from rahulshukla-webkul/development
Development
2020-01-22 19:24:06 +05:30
rahul shukla 15aca03e54 codeception/module-laravel5 2020-01-22 19:16:47 +05:30
rahul shukla 0a0a86bf46 codeception/module-filesystem 2020-01-22 19:12:46 +05:30
rahul shukla 4e03cd81d3 codeception/module-asserts 2020-01-22 18:59:39 +05:30
rahul shukla 0337959327 merge conflicts 2020-01-22 18:50:01 +05:30
rahul shukla 01f0fc9a57 2089 and updated codeception dependencies 2020-01-22 18:44:53 +05:30
Jitendra Singh 7f561c5793
Merge pull request #2121 from jitendra-webkul/1.0
Issue #1397 fixed
2020-01-22 14:59:31 +05:30
Jitendra Singh 80a2ddb88d Issue #1397 fixed 2020-01-22 14:58:39 +05:30
Jitendra Singh c49b721d98
Merge pull request #2117 from jitendra-webkul/1.0
Fixed App URL in
2020-01-22 13:38:10 +05:30
Jitendra Singh c51c270e5e Fixed App URL in 2020-01-22 13:37:08 +05:30
Florian Bosdorff 78ccaf7ec0 reenable pipeline when pr is created 2020-01-22 09:03:07 +01:00
Jitendra Singh ec38ad1c65
Merge pull request #2115 from jitendra-webkul/1.0
Fixed issue
2020-01-22 13:29:23 +05:30
Jitendra Singh aa932c7ed2 Fixed issue 2020-01-22 13:28:34 +05:30
Jitendra Singh 3a1c989e8c
Merge pull request #2113 from jitendra-webkul/1.0
Revert guest checkout changes
2020-01-22 13:18:54 +05:30
Florian Bosdorff 00ec9b8c90 add missing directory in storage/app for test pipeline 2020-01-22 08:43:10 +01:00
Florian Bosdorff 3243437329 fix test artifacts in pipeline 2020-01-22 08:35:19 +01:00
Florian Bosdorff 8ee3118597 extend failing test; add test artifacts in pipeline 2020-01-22 08:31:20 +01:00
Florian Bosdorff 478533ae60 fix laravel 6 compartibility of tests; remove duplicated pipeline execution 2020-01-22 08:14:06 +01:00
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
Jitendra Singh bb302d4442 Revert guest checkout changes 2020-01-22 12:22:48 +05:30
Jitendra Singh 95676228ba
Merge pull request #2111 from bagisto/revert-2072-issue-1183/guest-checkout-configuration
Revert "Resolve #1183 guest checkout configuration"
2020-01-22 12:15:44 +05:30