Commit Graph

5016 Commits

Author SHA1 Message Date
Shubham Mehrotra 3ebe63ca74 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-09 15:10:06 +05:30
Shubham Mehrotra 187c99ce54 #2834 2020-04-09 13:26:33 +05:30
Jitendra Singh f4f84c0a0f
Merge pull request #2848 from shubhwebkul/master
misc. updates
2020-04-08 19:16:56 +05:30
Shubham Mehrotra c2022a9b50 checkout page email validation 2020-04-08 18:55:20 +05:30
Shubham Mehrotra 67a4720af9 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-08 11:31:50 +05:30
Shubham Mehrotra eda27956a5 margin added between wishlist icon and compare icon 2020-04-08 11:31:39 +05:30
Jitendra Singh 3ddb6a54b4
Merge pull request #2841 from shivam-webkul/master
issue #2792 resolved
2020-04-07 20:43:22 +05:30
shivam kumar 61f27800fd issue #2792 resolved 2020-04-07 19:51:42 +05:30
Jitendra Singh b3e326d5d7
Merge pull request #2839 from shivam-webkul/master
code changed for api
2020-04-07 15:28:50 +05:30
Jitendra Singh 2ce322bce7
Merge pull request #2838 from shubhwebkul/master
Issue #2329 resolved
2020-04-07 14:03:29 +05:30
Shubham Mehrotra 16d359a709 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-07 13:57:12 +05:30
Shubham Mehrotra 9e768afa3c #2329 2020-04-07 13:57:01 +05:30
shivam kumar c059d137b2 code changed for api 2020-04-07 12:50:40 +05:30
Shivam kumar 2118714ef2
Merge pull request #2835 from shivam-webkul/master
api changes
2020-04-06 21:50:07 +05:30
shivam kumar 4ec82687cd api changes 2020-04-06 21:47:17 +05:30
Jitendra Singh 3cac6fc745
Merge pull request #2831 from rahulcs0082/development
Issue #2812
2020-04-06 15:46:07 +05:30
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
rahulshukla-home 02cb64e3b1 Issue #2812 2020-04-06 13:21:40 +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