Commit Graph

3952 Commits

Author SHA1 Message Date
Jitendra Singh a587891532 Fixed syntax in ci.yml 2020-01-21 20:03:36 +05:30
Jitendra Singh 79898c9600
Merge pull request #2094 from jitendra-webkul/1.0
Updated ci.yml
2020-01-21 20:02:32 +05:30
Jitendra Singh ff41e0e417 Updated ci.yml 2020-01-21 20:01:45 +05:30
Jitendra Singh a524ae87ed
Merge pull request #2093 from jitendra-webkul/1.0
Added php extensions
2020-01-21 19:58:57 +05:30
Jitendra Singh bc70656ec8 Added php extensions 2020-01-21 19:58:11 +05:30
Jitendra Singh aad039aaa6
Merge pull request #2092 from jitendra-webkul/1.0
Updated ci.yml
2020-01-21 19:25:08 +05:30
Jitendra Singh a04ec5a12b Updated ci.yml 2020-01-21 19:22:29 +05:30
Jitendra Singh 58294b1e3a
Merge pull request #2091 from jitendra-webkul/1.0
composer.lock file updated
2020-01-21 19:19:13 +05:30
Jitendra Singh 6ce0ff0f41 composer.lock file updated 2020-01-21 19:18:16 +05:30
Jitendra Singh 48ddb65b15
Create ci.yml 2020-01-21 19:07:17 +05:30
Jitendra Singh 7c31029349
Merge pull request #2090 from jitendra-webkul/1.0
Added .env.ci file
2020-01-21 19:06:39 +05:30
Jitendra Singh cddba75d9e Added .env.ci file 2020-01-21 19:05:56 +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 c22213c97f
Merge pull request #2086 from jitendra-webkul/1.0
PHP version updated in composer.json
2020-01-21 17:02:39 +05:30
Jitendra Singh 3046aa617b PHP version updated in composer.json 2020-01-21 17:02:01 +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 85a27eeb58
Merge pull request #2085 from rahulshukla-webkul/development
php version updated for installer.
2020-01-21 16:07:41 +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
rahul shukla 4bb13981bb php version updated for installer. 2020-01-21 16:05:44 +05:30
Jitendra Singh 24f30c8110
Merge pull request #2084 from jitendra-webkul/1.0
PHP version updated in readme file
2020-01-21 15:55:32 +05:30
Jitendra Singh 6f12f21625 PHP version updated in readme file 2020-01-21 15:54:46 +05:30
Jitendra Singh 38a24626cc
Merge pull request #2083 from jitendra-webkul/1.0
Cart rule and catalog rule updated for laravel 6.0
2020-01-21 15:52:30 +05:30
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
Jitendra Singh 50bf92d658
Merge pull request #2082 from rahulshukla-webkul/6.0
6.0
2020-01-21 15:30:23 +05:30
rahul shukla 4f1e20d23c conflict resolve 2020-01-21 15:28:16 +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 a8a28ccf60
Merge pull request #2081 from jitendra-webkul/1.0
Issue #2075 fixed
2020-01-21 12:58:57 +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 2a9c3a04d5
Merge pull request #2080 from jitendra-webkul/1.0
Issue #2071 fixed
2020-01-20 19:59:42 +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 7ae2fee6e2 Merge branch 'prateek-latest1' into velocity 2020-01-20 19:33:22 +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