Commit Graph

4077 Commits

Author SHA1 Message Date
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Jitendra Singh a5559808f5
Merge pull request #2140 from shubhwebkul/velocity-updated
bagisto velocity theme updates
2020-02-04 16:30:31 +05:30
Jitendra Singh 95640bd8ac
Merge pull request #2240 from jitendra-webkul/1.0
Changelog updated
2020-02-04 16:20:41 +05:30
Jitendra Singh 54872cb4e4 Changelog updated 2020-02-04 16:19:54 +05:30
Jitendra Singh 193880eb89
Merge pull request #2235 from Haendlerbund/default-channel-and-locale-improvements
obey the default channel that has been set in config/app.php
2020-02-04 13:23:56 +05:30
Jitendra Singh ce7176e5ef
Merge pull request #2234 from vivek-webkul/patch-8
[Added: review delete api route added.]
2020-02-04 13:23:32 +05:30
Jitendra Singh 453908a768
Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
add ability to provide company_name in address during checkout
2020-02-04 11:40:39 +05:30
Jitendra Singh 9246311fa8
Merge pull request #2236 from rahulshukla-webkul/development
Issue #2227
2020-02-04 11:39:20 +05:30
Jitendra Singh 749b23924a
Merge pull request #2238 from jitendra-webkul/1.0
Issue #2237 fixed
2020-02-04 11:25:20 +05:30
Jitendra Singh 8f2d1779ee Issue #2237 fixed 2020-02-04 11:20:22 +05:30
rahul shukla f624f45a4a Issue #1976 2020-02-03 19:14:26 +05:30
rahul shukla 7ea4c4219c Issue #2227 2020-02-03 18:57:50 +05:30
Herbert Maschke 4833d9f8ec obey the default channel that has been set in config/app.php 2020-02-03 13:34:05 +01:00
Vivek Sharma 136deb0049 [Added: review delete api route added.] 2020-02-03 17:31:09 +05:30
shubhammehrotra.symfony@webkul.com 0cf4cc181a product-card wishlist icon 2020-02-03 17:14:58 +05:30
Jitendra Singh 9ff8550289
Merge pull request #2232 from rahulshukla-webkul/development
Development
2020-02-03 17:06:12 +05:30
rahul shukla b090f5264f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-03 17:01:35 +05:30
rahul shukla 9a9400fe23 Issue #2219 2020-02-03 17:01:23 +05:30
Jitendra Singh d6fd342341
Merge pull request #2228 from mohdfaizdev/2225
Fixed issue 2225
2020-02-03 13:51:20 +05:30
Jitendra Singh c1a11e275a
Merge pull request #2231 from rahulshukla-webkul/development
Issue #2226
2020-02-03 13:43:07 +05:30
rahul shukla ee97642b7a Issue #2226 2020-02-03 13:39:13 +05:30
Jitendra Singh 9db6494a1b
Merge pull request #2230 from jitendra-webkul/1.0
Issue #2182 fixed
2020-02-03 13:33:09 +05:30
Jitendra Singh b4f4fc5529 Issue #2182 fixed 2020-02-03 13:14:11 +05:30
Jitendra Singh 15860e9a5f
Merge pull request #2229 from jitendra-webkul/1.0
Issue #2203 fixed
2020-02-03 13:09:09 +05:30
Jitendra Singh 6560e13045 Resolved conflict 2020-02-03 13:03:32 +05:30
Jitendra Singh fa3c5deac6 Issue #2203 fixed 2020-02-03 13:01:54 +05:30
Mohd Faiz 970d05c1c4 Fixed issue 2225 2020-02-03 12:22:04 +05:30
shubhammehrotra.symfony@webkul.com 95e4933330 Merge branch 'velocity-updated' of https://github.com/shubhwebkul/bagisto into velocity-updated 2020-02-03 09:55:26 +05:30
Shubham Mehrotra c51cb168e8 new and featured products from ajax 2020-02-02 19:55:03 +05:30
Shubham Mehrotra fd4657f991 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-01 13:50:10 +05:30
Shubham Mehrotra 1f6ce71303 resolved issues 2020-02-01 13:42:53 +05:30
shubhammehrotra.symfony@webkul.com be3b8e34a7 category and category products through ajax 2020-01-31 20:01:36 +05:30
Jitendra Singh 09a7cc949a
Merge pull request #2222 from jitendra-webkul/1.0
Issue #2202 fixed
2020-01-31 19:17:19 +05:30
Jitendra Singh 677cd7e542 Issue #2202 fixed 2020-01-31 19:16:45 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Annika Wolff ab9300bbef merged conflicting factory manually 2020-01-31 09:40:12 +01:00
Jitendra Singh 09fe8cea1c
Merge pull request #2220 from rahulshukla-webkul/development
Development
2020-01-31 13:58:47 +05:30
Jitendra Singh a378c09f23
Merge pull request #2208 from vivek-webkul/patch-2
[Fixed: changed customer group code for newly created customer.]
2020-01-31 13:58:26 +05:30
rahul shukla 7fdf5b66ab Issue #2173 2020-01-31 13:31:38 +05:30
rahul shukla c64bb4f85b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-31 13:19:00 +05:30
rahul shukla 6565f25153 Issue #2182 2020-01-31 13:18:40 +05:30
Jitendra Singh 37dba8eabf
Merge pull request #2218 from jitendra-webkul/1.0
Issue #2203 fixed
2020-01-31 12:53:17 +05:30
Jitendra Singh 48398597bf Issue #2203 fixed 2020-01-31 12:48:35 +05:30
Jitendra Singh d9d7c2bc40
Merge pull request #2215 from Haendlerbund/introduce-some-cart-factories
add some factories
2020-01-31 12:35:25 +05:30
Jitendra Singh 4ebc76cc64
Merge pull request #2217 from jitendra-webkul/1.0
Issue #2207 fixed
2020-01-31 12:28:22 +05:30
Jitendra Singh dd634691fe Issue #2207 fixed 2020-01-31 12:23:52 +05:30
Jitendra Singh f3a34d5da9
Merge pull request #2212 from Haendlerbund/refactor-functional-attribute-test
refactor functional AttributeCest, that was flickering sometimes
2020-01-31 12:07:26 +05:30
Jitendra Singh 3c16599ddb
Merge pull request #2211 from Haendlerbund/add-channel-and-locale-filter-to-product-grid
Add channel and locale filter to product grid
2020-01-31 12:03:59 +05:30
shubhammehrotra.symfony@webkul.com e578d7d1db route issue resolved 2020-01-31 11:53:31 +05:30
Jitendra Singh e629a560d7
Merge pull request #2205 from rahulshukla-webkul/development
Issue #2192
2020-01-31 11:27:14 +05:30