Commit Graph

3223 Commits

Author SHA1 Message Date
Jitendra Singh 7d161e31ef
Merge pull request #2373 from Haendlerbund/locale-improvements
add improvements to locale determination on product creation
2020-02-18 15:10:14 +05:30
shubhammehrotra.symfony@webkul.com f2d582a57b Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-18 11:52:42 +05:30
shubhammehrotra.symfony@webkul.com 22b80d0904 carousel in quick view 2020-02-18 11:52:37 +05:30
Jitendra Singh 0fee8123ba
Merge pull request #2475 from Haendlerbund/feature/allow-to-configure-outgoing-emails
Feature/allow to configure outgoing emails
2020-02-18 11:05:49 +05:30
shubhammehrotra.symfony@webkul.com 557286822d Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-18 10:58:36 +05:30
shubhammehrotra.symfony@webkul.com 9ee02d5f96 quick view & misc. bug fixes 2020-02-18 10:57:39 +05:30
Herbert Maschke 8909c74ad8 Merge branch 'bagisto/master' into feature/allow-to-configure-outgoing-emails 2020-02-17 16:54:26 +01:00
Herbert Maschke b0e37edd63 only send emails when configured so 2020-02-17 16:52:58 +01:00
Herbert Maschke cdc292c196 enable all notifications by default 2020-02-17 16:44:13 +01:00
Herbert Maschke 5cbbf7c4f6 add english i18n strings for email notification setup 2020-02-17 16:35:31 +01:00
Herbert Maschke a889b1f31f add mail notification defaults (everything true) to Config/system.php 2020-02-17 16:25:14 +01:00
Herbert Maschke 5129507456 add mail notification defaults (everything true) to ConfigTableSeeder.php 2020-02-17 16:04:59 +01:00
rahul shukla 8d2662b996 Issue #2467 2020-02-17 19:36:31 +05:30
rahul shukla 3c94cdf100 Issue #2463 2020-02-17 17:59:15 +05:30
shubhammehrotra.symfony@webkul.com e90193d476 misc. bug fixes 2020-02-14 16:48:57 +05:30
shubhammehrotra.symfony@webkul.com fccfbededb Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-13 20:37:52 +05:30
shubhammehrotra.symfony@webkul.com 1eb2aaf447 payment method update issue fixed 2020-02-13 20:37:21 +05:30
shubhammehrotra.symfony@webkul.com 7109998c3c updates 2020-02-13 20:23:36 +05:30
Jitendra Singh 5b032c2f5e
Merge pull request #2460 from shubhwebkul/velocity-updated
WIP: misc. updates
2020-02-13 19:01:55 +05:30
shubhammehrotra.symfony@webkul.com 78c3b98869 misc. updates 2020-02-13 18:56:26 +05:30
shubhammehrotra.symfony@webkul.com 986eb1f929 misc. updates 2020-02-13 18:37:58 +05:30
Jitendra Singh 3fb2b8a5c9
Merge pull request #2444 from Haendlerbund/add-data-to-factories
Added fields to order related factories
2020-02-13 17:11:17 +05:30
Jitendra Singh 5a6549f7ab
Merge pull request #2456 from shubhwebkul/velocity-updated
checkout misc. bug fixes
2020-02-13 15:57:34 +05:30
shubhammehrotra.symfony@webkul.com c85813de37 checkout updates 2020-02-13 15:29:33 +05:30
Jitendra Singh b3316a368c
Merge pull request #2455 from rahulshukla-webkul/development
Issue #2449
2020-02-13 14:55:27 +05:30
rahul shukla 9d80f73319 Issue #2449 2020-02-13 14:41:40 +05:30
Vivek Sharma 0219862de0 [Fixed: issue #2440 resolved.] 2020-02-13 14:00:59 +05:30
shubhammehrotra.symfony@webkul.com dc1888fceb assets 2020-02-12 19:18:23 +05:30
shubhammehrotra.symfony@webkul.com 98cdcfed10 merged conflicts 2020-02-12 19:17:20 +05:30
shubhammehrotra.symfony@webkul.com 25e3da0fa7 misc. bug fixes 2020-02-12 19:15:34 +05:30
rahul shukla f738cf4240 Issue #2439 2020-02-12 17:52:54 +05:30
Vivek Sharma c9e6baff5d [Fixed: issue #2440 has been resolved.] 2020-02-12 17:11:21 +05:30
Vivek Sharma b6ab1b0f99 [Fixed: layout issue #2381 resolved.] 2020-02-12 16:46:06 +05:30
Vivek Sharma 7098e651d3 [Fixed: layout issue #2381 resolved.] 2020-02-12 16:42:40 +05:30
Vivek Sharma 8db782bacf [Fixed: issue #2436 has been resolved.] 2020-02-12 15:13:07 +05:30
MonaHartdegen 2849ddd7db added fields to order related factories 2020-02-12 09:58:50 +01:00
Jitendra Singh ba8f44bea8
Merge pull request #2443 from jitendra-webkul/1.0
Converted configuration boolean type to switch
2020-02-12 13:46:25 +05:30
Jitendra Singh 881027ca4e Converted configuration boolean type to switch 2020-02-12 13:45:26 +05:30
Jitendra Singh 8550c0424f
Merge pull request #2442 from shubhwebkul/velocity-updated
checkout page updates
2020-02-12 13:20:42 +05:30
shubhammehrotra.symfony@webkul.com 3d3fa3408c checkout page updates 2020-02-12 13:18:24 +05:30
Jitendra Singh a6790b97d1 Issue #2438 fixed 2020-02-12 13:07:17 +05:30
Jitendra Singh 6243ad8c31
Merge pull request #2433 from jitendra-webkul/1.0
Issue #2250 fixed
2020-02-11 20:10:49 +05:30
Jitendra Singh 9c60312c21 Issue #2250 fixed 2020-02-11 20:06:38 +05:30
Jitendra Singh c78b76f3aa
Merge pull request #2432 from jitendra-webkul/1.0
Fixed intentation in CoreConfigRepository
2020-02-11 19:18:15 +05:30
Jitendra Singh ae8c9311cb
Merge pull request #2431 from vivek-webkul/patch-32
[Fixed: layout issue regarding #2399 resolved.]
2020-02-11 19:13:55 +05:30
Jitendra Singh fab5cc7a4f Fixed intentation in CoreConfigRepository 2020-02-11 19:13:39 +05:30
Vivek Sharma 31b7db34cb [Fixed: layout issue regarding #2399 resolved.] 2020-02-11 18:59:35 +05:30
Vivek Sharma bef1068d70 Fixed: button alignment corrected. 2020-02-11 18:40:58 +05:30
Jitendra Singh 13a5b3a116
Merge pull request #2429 from shubhwebkul/velocity-updated
minor bug fixes
2020-02-11 18:33:57 +05:30
shubhammehrotra.symfony@webkul.com 4323637bf9 minor bugs 2020-02-11 18:15:06 +05:30