Commit Graph

4946 Commits

Author SHA1 Message Date
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
Jitendra Singh 141090570f
Merge pull request #2761 from jitendra-webkul/1.0
Fixed validation issue
2020-03-24 20:04:26 +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 0632ea757c
Merge pull request #2760 from bagisto/revert-2758-1.0
Revert "Upgraded velocity theme npm dependencies"
2020-03-24 19:23:19 +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
Jitendra Singh d3cfa37abb
Merge pull request #2757 from shubhwebkul/patch-1
Issue #2750 resolved
2020-03-24 18:16:25 +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
Jitendra Singh adc75554a1
Merge pull request #2756 from jitendra-webkul/1.0
Fixed undefind variable issue in rental booking helper
2020-03-24 16:44:10 +05:30
Pranshu Tomar cf314c964e Fixed undefind variable issue in rental booking helper 2020-03-24 16:42:57 +05:30
Jitendra Singh c7a2581119
Merge pull request #2754 from jitendra-webkul/1.0
Issue #2670 fixed
2020-03-24 16:30:31 +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 54de666781 Updated changelog 2020-03-24 13:56:49 +05:30
Pranshu Tomar 66213ab5f3 Issue #2717 fixed 2020-03-24 13:54:17 +05:30
Jitendra Singh 54c33b0236
Merge pull request #2749 from jitendra-webkul/1.0
Updated changelog
2020-03-24 12:15:58 +05:30
Pranshu Tomar 9b4412b554 Updated changelog 2020-03-24 12:11:56 +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
Pranshu Tomar 6b3a30645c Removed commented code fom cart controller 2020-03-24 11:03:36 +05:30
Jitendra Singh 3a4dfa3180
Merge pull request #2746 from jitendra-webkul/1.0
Issue #2724 fixed
2020-03-24 10:57:28 +05:30
Pranshu Tomar 2334cf4cc7 Issue #2724 fixed 2020-03-24 10:52:45 +05:30
Shubham Mehrotra 0af1f87929 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-24 10:33:22 +05:30
Shubham Mehrotra 7e082f7aa3 #2610 2020-03-24 10:33:03 +05:30
rahulshukla-home 4510a42d34 testing 2020-03-24 02:17:17 +05:30
Jitendra Singh 1f5ec6aa72
Merge pull request #2743 from jitendra-webkul/1.0
Issue #2722 fixed
2020-03-23 22:57:33 +05:30
Pranshu Tomar 6d5cc8a456 Issue #2722 fixed 2020-03-23 22:53:23 +05:30
Jitendra Singh e0a4051f71
Merge pull request #2742 from jitendra-webkul/1.0
Issue #2728 fixed
2020-03-23 22:16:18 +05:30
Pranshu Tomar b03f0075aa Issue #2728 fixed 2020-03-23 22:12:21 +05:30