Commit Graph

3874 Commits

Author SHA1 Message Date
rahul shukla e3e7c47b15 updated comment 2020-01-28 10:57:17 +05:30
rahul shukla 469ed35ede Issue #2155 2020-01-28 10:55:00 +05:30
Jitendra Singh 0cd4a2678a
Merge pull request #1996 from Haendlerbund/introduce-api-token-columns-into-database
add missing api_token columns to database (table customers and admins)
2020-01-27 18:31:13 +05:30
Jitendra Singh b8115c808e
Merge pull request #2144 from Haendlerbund/trigger-db-prefixes
fix trigger according to optional db-prefix
2020-01-27 17:21:26 +05:30
Jitendra Singh 0b3a7a6c6a
Merge pull request #2157 from jitendra-webkul/1.0
Removed commented code
2020-01-27 16:52:08 +05:30
Jitendra Singh 8176317a59 Removed commented code 2020-01-27 16:46:58 +05:30
Jitendra Singh 3e2e6f2c75
Merge pull request #2156 from jitendra-webkul/1.0
Issue #2087 fixed
2020-01-27 16:42:01 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
Jitendra Singh 10c1a14c45
Merge pull request #2153 from rahulshukla-webkul/development
Issue #2149
2020-01-27 15:09:29 +05:30
rahul shukla 2c2e6588c1 Issue #2149 2020-01-27 15:03:37 +05:30
Jitendra Singh 3a69b97bd2
Merge pull request #2151 from rahulshukla-webkul/development
Development
2020-01-27 13:35:08 +05:30
Jitendra Singh 0a2116a77c
Merge pull request #2150 from jitendra-webkul/1.0
Issue #2054 fixed
2020-01-27 13:34:14 +05:30
rahul shukla 41ae3048ff Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-27 13:24:37 +05:30
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
Jitendra Singh 3a2fb2c03a Issue #2054 fixed 2020-01-27 13:10:30 +05:30
Jitendra Singh c37818dcb9
Merge pull request #2148 from jitendra-webkul/1.0
Issue #2146 fixed
2020-01-27 12:39:05 +05:30
Jitendra Singh edf5dc34fd Issue #2146 fixed 2020-01-27 12:38:13 +05:30
Jitendra Singh 4e94d540e9
Merge pull request #2138 from rahulshukla-webkul/development
Development
2020-01-27 10:54:12 +05:30
Florian Bosdorff d2a8911aaa fix trigger according to optional db-prefix 2020-01-26 21:10:57 +01:00
rahul shukla cbaebaa388 query optimization and hide of expose model 2020-01-25 17:00:31 +05:30
rahulshukla-webkul 212a32f302
Merge pull request #2137 from bagisto/revert-2065-velocity
Revert "Bagisto theme added"
2020-01-25 14:58:46 +05:30
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30
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