Commit Graph

4999 Commits

Author SHA1 Message Date
Jitendra Singh ae275de3a1
Merge pull request #2833 from shubhwebkul/master
compare page update height after loading images
2020-04-06 15:45:58 +05:30
Shubham Mehrotra 804dc01512 compare page update height after loading images 2020-04-06 14:48:54 +05:30
Jitendra Singh 9d357e466d
Merge pull request #2830 from shubhwebkul/master
customer accordian view and file picker view in velocity
2020-04-06 10:55:49 +05:30
Shubham Mehrotra 0e06a114af customer accordian design update 2020-04-06 10:46:11 +05:30
Shubham Mehrotra e626ebae0c Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-06 10:27:25 +05:30
Shubham Mehrotra 26b0e253d1 customer panel accordian view and file picker view 2020-04-06 10:27:07 +05:30
Jitendra Singh 4b59e7e746
Merge pull request #2824 from shubhwebkul/master
misc. updates
2020-04-03 17:54:40 +05:30
Shubham Mehrotra b92e6796c3 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-03 17:42:12 +05:30
Shubham Mehrotra 9bcc6242dd customer options click issue resolved 2020-04-03 17:41:57 +05:30
Shubham Mehrotra 4c8ad5068b category call get products method 2020-04-03 17:41:27 +05:30
Jitendra Singh 6ee462ac01
Merge pull request #2823 from rahulcs0082/development
Development
2020-04-03 13:42:57 +05:30
rahulshukla-home 961850b2e9 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-04-03 13:31:32 +05:30
rahulshukla-home 07f351322d revert back changes in format price 2020-04-03 13:31:09 +05:30
Shubham Mehrotra bc838a2269 remove irrelevant xhr 2020-04-03 11:20:52 +05:30
Jitendra Singh b631f5ef7d
Merge pull request #2820 from shubhwebkul/master
Issue #2775 resovled
2020-04-02 20:58:51 +05:30
Shubham Mehrotra 96e730f848 #2775 2020-04-02 20:35:26 +05:30
Jitendra Singh 258e0b3fbe
Merge pull request #2817 from shubhwebkul/master
misc. updates
2020-04-02 20:27:59 +05:30
Shubham Mehrotra ff20147e23 remove irrelevant css 2020-04-02 19:50:59 +05:30
Shubham Mehrotra 438aab3021 bundled assets 2020-04-02 19:22:11 +05:30
Shubham Mehrotra 9f36a8847c modal view update 2020-04-02 19:20:35 +05:30
Shubham Mehrotra 0c0dc5da60 checkout page issue 2020-04-02 17:13:36 +05:30
Jitendra Singh e8cc97f856
Merge pull request #2806 from bagisto/dependabot/composer/symfony/http-foundation-4.4.7
Bump symfony/http-foundation from 4.4.5 to 4.4.7
2020-04-02 14:04:18 +05:30
Jitendra Singh 26909c1cc8
Merge pull request #2816 from shubhwebkul/master
Event added: - bagisto.shop.layout.header.before
2020-04-02 13:45:01 +05:30
Shubham Mehrotra efd96f8259 {git commit -m 2020-04-02 12:49:44 +05:30
Jitendra Singh f4249f25f6
Merge pull request #2815 from shubhwebkul/patch-2
misc. bug fixes
2020-04-01 18:39:13 +05:30
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 3f8741e671 resolved conflicts 2020-04-01 18:29:48 +05:30
Shubham Mehrotra a5e9c23530 checkout page margin added 2020-04-01 18:26:27 +05:30
Shubham Mehrotra e259d6b8bf #2785 2020-04-01 17:58:10 +05:30
Shubham Mehrotra eabbbfe15a #2808 2020-04-01 16:21:22 +05:30
Jitendra Singh d65653a6fe
Merge pull request #2809 from shubhwebkul/patch-1
misc. velocity theme updates
2020-04-01 14:09:11 +05:30
Shubham Mehrotra dd88a81f92 remove line 2020-04-01 12:26:21 +05:30
dependabot[bot] 9d6ac8aae5
Bump symfony/http-foundation from 4.4.5 to 4.4.7
Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.5 to 4.4.7.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.4.5...v4.4.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-31 14:14:17 +00:00
Steffen Mahler 1b884cdb42 refactoring, fix typo 2020-03-31 09:12:47 +02:00
Steffen Mahler dbb17a93e3 fix rounding in taxcest 2020-03-30 19:35:56 +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
Jitendra Singh 44672cff67
Merge pull request #2783 from shubhwebkul/patch-1
misc. bug fixes
2020-03-29 15:43:00 +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
Jitendra Singh 2573b00039
Merge pull request #2771 from cagartner/add-ptBR-velocity
Added translation to velocity and fixed some admin translations
2020-03-26 10:31:41 +05:30