Commit Graph

3680 Commits

Author SHA1 Message Date
Jitendra Singh 256c6fd4b5
Merge pull request #2802 from Haendlerbund/pr-2753/flickering-locale-factory
fix still flickering locale factory
2020-04-01 18:36:03 +05:30
Jitendra Singh 6e18ea7f8e
Merge pull request #2803 from Haendlerbund/fix_tax_rate_rounding
Fix tax rate rounding
2020-04-01 18:35:53 +05:30
Shubham Mehrotra dd88a81f92 remove line 2020-04-01 12:26:21 +05:30
Steffen Mahler 1b884cdb42 refactoring, fix typo 2020-03-31 09:12:47 +02:00
Steffen Mahler c13ae36494 fix tax rate rounding 2020-03-30 19:30:10 +02:00
Shubham Mehrotra 2bd1458990 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-30 21:09:59 +05:30
Shubham Mehrotra 0005241794 misc. updates 2020-03-30 21:09:40 +05:30
Annika Wolff 505014266e fix still flickering locale factory 2020-03-30 11:05:45 +02:00
Jitendra Singh 88ce2bd320
Merge pull request #2799 from jitendra-webkul/1.0
Issue #2764 fixed
2020-03-29 16:25:41 +05:30
Pranshu Tomar 4fd49df5c5 Issue #2764 fixed 2020-03-29 16:20:43 +05:30
Jitendra Singh 633db5e4bd
Merge pull request #2798 from jitendra-webkul/1.0
Issue #2763 fixed
2020-03-29 16:12:09 +05:30
Pranshu Tomar b28ac37c8f Issue #2763 fixed 2020-03-29 15:35:56 +05:30
Shubham Mehrotra 200ac87cb1 #2780 2020-03-27 15:10:30 +05:30
Shubham Mehrotra 965f9ae806 #2776 2020-03-27 12:13:48 +05:30
Shubham Mehrotra 1b14466d19 #2779 #2778 #2775 2020-03-27 12:02:03 +05:30
Jitendra Singh 6902057096
Merge pull request #2767 from shubhwebkul/patch-1
compare products in default theme
2020-03-26 13:27:11 +05:30
Carlos Augusto Gartner 4f20e888bf Added new translations for shop and velocity 2020-03-25 14:29:44 -03:00
Carlos Augusto Gartner 3ab051c07a Added translation to velocity and fixed some admin translations 2020-03-25 12:59:15 -03:00
Shubham Mehrotra 15c4e0686b compare products in default theme 2020-03-25 13:10:33 +05:30
Shubham Mehrotra 38b65dd78f resolved conflicts 2020-03-24 20:15:13 +05:30
Shubham Mehrotra 139bd36443 forget password message 2020-03-24 20:11:48 +05:30
Pranshu Tomar 7e81f0bf4f Fixed validation issue 2020-03-24 19:59:06 +05:30
Shubham Mehrotra 6aaef49e2a resolved conflicts 2020-03-24 19:32:07 +05:30
Shubham Mehrotra b079b6f83c wishlist issue 2020-03-24 19:28:37 +05:30
Jitendra Singh 411365d476
Revert "Upgraded velocity theme npm dependencies" 2020-03-24 19:23:01 +05:30
Shubham Mehrotra cf2610f239 cart move to wishlist issue resolved 2020-03-24 19:18:00 +05:30
Shubham Mehrotra 11746a9ca6 resolved conflicts 2020-03-24 18:47:57 +05:30
Shubham Mehrotra 3514612fe9 #2610 2020-03-24 18:44:38 +05:30
Jitendra Singh c01c70e776
Merge pull request #2758 from jitendra-webkul/1.0
Upgraded velocity theme npm dependencies
2020-03-24 18:20:03 +05:30
Pranshu Tomar 3d3a2d6036 Resolve conflicts 2020-03-24 18:13:58 +05:30
Pranshu Tomar 80508e7a06 Upgraded velocity theme npm dependencies 2020-03-24 18:09:02 +05:30
Shubham Mehrotra 299cdfdde7 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-24 17:24:26 +05:30
Shubham Mehrotra 23ddd66e7f #2750 2020-03-24 17:24:03 +05:30
Jitendra Singh ce2c329e63
Merge pull request #2755 from shubhwebkul/patch-1
Issue #2600 resolved
2020-03-24 17:12:17 +05:30
Shubham Mehrotra 10c39a8de2 resolved conflicts 2020-03-24 16:45:56 +05:30
Jitendra Singh 1d9b2659b9
Merge pull request #2753 from Haendlerbund/prevent-locale-factory-from-flickering
prevent locale factory from flickering
2020-03-24 16:45:12 +05:30
Pranshu Tomar cf314c964e Fixed undefind variable issue in rental booking helper 2020-03-24 16:42:57 +05:30
Shubham Mehrotra f7187a3f2f Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-24 16:27:30 +05:30
Shubham Mehrotra 773e41dab4 #2600 2020-03-24 16:27:12 +05:30
Pranshu Tomar 50decb81cb Conflicts resolved 2020-03-24 16:25:10 +05:30
Pranshu Tomar b1049ac3ea Conflicts resolved 2020-03-24 16:23:42 +05:30
Pranshu Tomar ded3591ea6 Issue #2670 fixed 2020-03-24 15:41:43 +05:30
Annika Wolff 8a2a84b1e6 get existing locale or create new one 2020-03-24 10:58:20 +01:00
Jitendra Singh e6e84dfdf9
Merge pull request #2751 from jitendra-webkul/1.0
Issue #2717 fixed
2020-03-24 14:01:00 +05:30
Pranshu Tomar 66213ab5f3 Issue #2717 fixed 2020-03-24 13:54:17 +05:30
Jitendra Singh 80a342b20b
Merge pull request #2745 from shubhwebkul/patch-1
Issue #2610 resolved
2020-03-24 11:38:41 +05:30
Jitendra Singh c67f971a90
Merge pull request #2748 from rahulcs0082/development
Development
2020-03-24 11:37:13 +05:30
rahulshukla-home f19206ab6e Issue #2593 fixed 2020-03-24 11:26:03 +05:30
Jitendra Singh 1e84811539
Merge pull request #2747 from jitendra-webkul/1.0
Issue #2715 fixed
2020-03-24 11:06:37 +05:30
Pranshu Tomar 4b84b89251 Issue #2715 fixed 2020-03-24 11:05:34 +05:30