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 |
Herbert Maschke
|
9cab15afcd
|
load core factories
|
2020-01-23 14:24:40 +01:00 |
|
Herbert Maschke
|
5ebb67dd81
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-23 14:18:17 +01:00 |
|
Herbert Maschke
|
3017fa337d
|
add necessary packages/Webkul/Core/src/Database/Factories/LocaleFactory.php
|
2020-01-23 14:11:56 +01:00 |
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 |
|
Herbert Maschke
|
4629a3bb0f
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-22 14:59:18 +01:00 |
|
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 |
|
Herbert Maschke
|
6eacf880a4
|
use an locale from a country in europe so the vat id can be generated
|
2020-01-22 10:38:35 +01:00 |
|
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 |
|
Herbert Maschke
|
8d1d03d25b
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-21 13:44:09 +01:00 |
|
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 |
|
Herbert Maschke
|
4596a77c07
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-21 11:36:26 +01:00 |
|
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 |
|
Jitendra Singh
|
dfa4272cf2
|
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots
Set correct category url_path in multiple root categories environment
|
2020-01-20 13:27:04 +05:30 |
|
Herbert Maschke
|
bc44867956
|
check if date_of_birth and oldpassword are set in request in profile edit action
|
2020-01-20 08:54:06 +01:00 |
|
prateek srivastava
|
4bef67fd7f
|
issue Product Page is not opening, Flash message is not showing properly in cart page. fixed
|
2020-01-20 12:37:20 +05:30 |
Annika Wolff
|
132dd6c0f0
|
introduce guest checkout configuration
|
2020-01-17 14:42:47 +01:00 |
|
Herbert Maschke
|
7c9908401f
|
improve the way server side validation errors are being displayed
|
2020-01-17 12:54:02 +01:00 |
|
Jitendra Singh
|
8612bd1385
|
Merge pull request #2069 from jitendra-webkul/1.0
Fixed cms textarea field issue
|
2020-01-17 14:58:27 +05:30 |
|
Jitendra Singh
|
6535afb52c
|
Fixed cms textarea field issue
|
2020-01-17 14:57:36 +05:30 |
|
Jitendra Singh
|
a6960f2916
|
Merge pull request #2068 from jitendra-webkul/1.0
Removed Developement menu
|
2020-01-17 14:49:25 +05:30 |
|
Jitendra Singh
|
eb3fdc12c6
|
Removed Developement menu
|
2020-01-17 14:48:39 +05:30 |
|
Jitendra Singh
|
880868738a
|
Merge pull request #2067 from jitendra-webkul/1.0
Issue #2058 fixed
|
2020-01-17 12:06:06 +05:30 |
|
Jitendra Singh
|
7d7e86e85c
|
Issue #2058 fixed
|
2020-01-17 12:05:28 +05:30 |
|
prateek srivastava
|
5055c6c6a0
|
checkbox style fixed
|
2020-01-16 20:39:28 +05:30 |
|
prateek srivastava
|
b55726881d
|
checkbox style fixed
|
2020-01-16 20:38:34 +05:30 |
|
prateek srivastava
|
8c21edec5a
|
file changed
|
2020-01-16 19:46:32 +05:30 |
|
prateek srivastava
|
b01526d9ea
|
conflict resolved
|
2020-01-16 19:26:36 +05:30 |
|
prateek srivastava
|
103d30d7b4
|
drawer responsive
|
2020-01-16 19:24:04 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
6ef9ed0822
|
updates
|
2020-01-16 17:10:38 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
ba355a6f31
|
passing data from slider repository instead of id
|
2020-01-16 16:22:00 +05:30 |
|
Herbert Maschke
|
d281aa373b
|
remove factories (except necessary ones) from this pull request, as we deliver them as a separate PR
|
2020-01-16 09:54:04 +01:00 |
|
shubhammehrotra.symfony@webkul.com
|
497271fa04
|
resolved issues
|
2020-01-16 13:37:36 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
81d9d34acc
|
velocity-configuration-added
|
2020-01-16 13:22:18 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
7c1bd634f2
|
remove velocity
|
2020-01-16 13:09:33 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
485fbcb1c5
|
Merge branch 'velocity' of github.com:shubhwebkul/bagisto into velocity
|
2020-01-16 13:05:55 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
fc2888aa74
|
updates
|
2020-01-16 12:48:42 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
0468b7fa58
|
pass locale data in view_render_event
|
2020-01-16 12:37:52 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
4e5275b6fc
|
merged with prateek
|
2020-01-15 20:08:23 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
1ccc370189
|
merged with prateek
|
2020-01-15 20:05:53 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
958c9ce3e8
|
Merge branch 'prateek-latest1' into velocity-1
|
2020-01-15 20:04:16 +05:30 |
|
shubhammehrotra.symfony@webkul.com
|
ac19aa2da3
|
coupon applied
|
2020-01-15 20:00:55 +05:30 |
|
Herbert Maschke
|
e0c2814f2e
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-15 15:29:55 +01:00 |
|
Herbert Maschke
|
ab28b75eff
|
add validation rule
|
2020-01-15 15:29:31 +01:00 |
|
prateek srivastava
|
39f7fd9c8c
|
Merge branch 'velocity-1' of https://github.com/shubhwebkul/bagisto into prateek-latest1
|
2020-01-15 19:29:28 +05:30 |
|
prateek srivastava
|
933b073854
|
WIP responsive
|
2020-01-15 19:29:11 +05:30 |
|
Jitendra Singh
|
ab8001d20c
|
Merge pull request #2062 from jitendra-webkul/1.0
Issue #2054 fixed
|
2020-01-15 19:08:54 +05:30 |
|
Jitendra Singh
|
130ed41044
|
Issue #2054 fixed
|
2020-01-15 19:07:12 +05:30 |
|
Jitendra Singh
|
d931571c35
|
Merge pull request #2061 from jitendra-webkul/1.0
Issue #2054 fixed
|
2020-01-15 19:03:59 +05:30 |
|
Jitendra Singh
|
9e5fc5bf1e
|
Issue #2054 fixed
|
2020-01-15 19:03:07 +05:30 |
|
Herbert Maschke
|
3ab9b62028
|
add vat_id to AddressDataGrid.php
|
2020-01-15 14:17:13 +01:00 |
|
Jitendra Singh
|
d80a3c7a5f
|
Merge pull request #2059 from jitendra-webkul/1.0
Removed ')' in page edit blade
|
2020-01-15 18:42:24 +05:30 |
|
Jitendra Singh
|
b552aba450
|
Removed ')' in page edit blade
|
2020-01-15 18:40:57 +05:30 |
|
Herbert Maschke
|
57aa522282
|
introduce company_name and vat_id also in shop admin backend
|
2020-01-15 14:02:51 +01:00 |
|
Jitendra Singh
|
915213711d
|
Merge pull request #2057 from jitendra-webkul/1.0
Issue #1863 fixed
|
2020-01-15 17:46:03 +05:30 |
|
Jitendra Singh
|
1e73cc9bc8
|
Issue #1863 fixed
|
2020-01-15 17:45:15 +05:30 |
|
Jitendra Singh
|
2049c45b0f
|
Merge pull request #2056 from jitendra-webkul/1.0
Issue #1863 fixed
|
2020-01-15 17:09:20 +05:30 |