Commit Graph

2791 Commits

Author SHA1 Message Date
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 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 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
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
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
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 80a2ddb88d Issue #1397 fixed 2020-01-22 14:58:39 +05:30
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
rahulshukla-webkul 8bd9f0bc9d
Revert "Resolve #1183 guest checkout configuration" 2020-01-22 11:58:56 +05:30
Jitendra Singh 3aec5047f6
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
Resolve #1183 guest checkout configuration
2020-01-22 11:32:45 +05:30
shubhammehrotra.symfony@webkul.com d48493225c fixed drawer issues 2020-01-21 21:30:55 +05:30
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
2020-01-21 16:34:38 +05:30
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
rahul shukla 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 5cc7b4aae2 Issue #2075 fixed 2020-01-21 12:58:11 +05:30
shubhammehrotra.symfony@webkul.com 4bf3e43bd8 resolved issues 2020-01-20 20:20:51 +05:30
Jitendra Singh 176feecb55 Resolved conflicts 2020-01-20 19:59:04 +05:30
Jitendra Singh b18f2292c4 Issue #2071 fixed 2020-01-20 19:57:10 +05:30
shubhammehrotra.symfony@webkul.com d3ccadb1a2 Merge branch 'velocity' into prateek-latest1 2020-01-20 19:31:19 +05:30
shubhammehrotra.symfony@webkul.com 47b06aa3cf updates 2020-01-20 19:30:55 +05:30
prateek srivastava 66e8fc1a8c Merge branch 'velocity' of https://github.com/shubhwebkul/bagisto into prateek-latest1 2020-01-20 18:48:17 +05:30
prateek srivastava cefad5c834 isue fixed 2020-01-20 18:47:32 +05:30
shubhammehrotra.symfony@webkul.com 1271b8a60b Merge branch 'master' of github.com:shubhwebkul/bagisto into velocity 2020-01-20 17:20:56 +05:30
shubhammehrotra.symfony@webkul.com 6d94387fe3 updates 2020-01-20 17:20:14 +05:30
shubhammehrotra.symfony@webkul.com 76829f8f93 updates 2020-01-20 16:14:02 +05:30
Jitendra Singh 6b3415f0e8
Merge pull request #2076 from jitendra-webkul/1.0
Issue #2074 fixed
2020-01-20 15:27:59 +05:30
Jitendra Singh 7e14737f8c Issue #2074 fixed 2020-01-20 15:26:31 +05:30