Commit Graph

619 Commits

Author SHA1 Message Date
Shubham Mehrotra bd8315dafb minified jquery-ez-plus file 2020-06-05 19:39:48 +05:30
Florian Bosdorff 351c38c9e8 add default value for search term 2020-06-05 08:08:31 +02:00
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
Shubham Mehrotra e77618f469 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-05-28 15:58:48 +05:30
Shubham Mehrotra 1dace6e5cf remove irrelevant code 2020-05-28 15:58:31 +05:30
Jitendra Singh 05a1e0eb13
Merge pull request #3125 from kmso-de/bugfix/menu-icons-mobile
overlapping logo with menu icons (click action)
2020-05-28 15:09:35 +05:30
Jan Bickel b6048ea60a overlapping logo with menu icons (click action), built assets 2020-05-27 18:04:38 +02:00
rahulshukla-home 9963c87bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-27 18:37:06 +05:30
rahulshukla-home 2c002a0f8a Issue #2729 2020-05-27 18:36:52 +05:30
Jan Bickel 3fad14a569 overlapping logo with menu icons (click action) 2020-05-27 13:11:13 +02:00
Jitendra Singh b254736bd5
Merge pull request #3123 from shubhwebkul/master
Issue #1522 resolved
2020-05-27 16:23:20 +05:30
Jitendra Singh 8e3be0c692 Merge pull request #3109 from Haendlerbund/add-field-company-name-to-views
add field company_name to views
2020-05-27 15:04:18 +05:30
Shubham Mehrotra 9eb14326c4 #1522 2020-05-27 13:03:10 +05:30
rahulshukla-home a500fa9074 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-22 13:13:10 +05:30
rahulshukla-home 01884e09c0 Issue #3089 fixed 2020-05-22 13:12:36 +05:30
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Jitendra Singh e0940edbb4
Merge pull request #3104 from shubhwebkul/patch-2
Issue #3041 resolved
2020-05-21 11:56:52 +05:30
Jitendra Singh 718a38ff02
Merge pull request #3103 from shubhwebkul/patch-1
Issue #2997 resolved
2020-05-21 11:56:33 +05:30
Jitendra Singh cce9167669
Merge pull request #3102 from rahulcs0082/development
Issue #3067 fixed
2020-05-21 11:56:12 +05:30
Shubham Mehrotra 0607b15b3f #3041 2020-05-20 19:52:00 +05:30
Shubham Mehrotra 40bbad93b3 remove irrelevant code 2020-05-20 18:27:07 +05:30
Shubham Mehrotra 47ae40d6b1 #2997 2020-05-20 18:24:33 +05:30
rahulshukla-home 4cf8b7cddb Issue #3089 2020-05-20 17:15:10 +05:30
Jitendra Singh 4842eb4de6
Merge pull request #3101 from shubhwebkul/patch-2
Issue #3096 resolved
2020-05-20 14:53:46 +05:30
Shubham Mehrotra 7aa860d173 #3096 2020-05-20 13:32:34 +05:30
Shubham Mehrotra 646e4b6241 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-05-20 12:47:44 +05:30
Shubham Mehrotra 2fdd75ab92 #3097 2020-05-20 12:47:26 +05:30
rahulshukla-home 15592aa8b1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-20 12:15:36 +05:30
rahulshukla-home 07db69b2f6 Issue #3095 2020-05-20 12:15:19 +05:30
Shubham Mehrotra 74357b56a7 #3076 2020-05-19 13:56:07 +05:30
Jitendra Singh b4e11a842b
Merge pull request #3092 from rahulcs0082/development
Issue #3089
2020-05-19 12:37:57 +05:30
Jitendra Singh b520af03c3
Merge pull request #3091 from jitendra-webkul/1.0
SEO optimization added for velocity and og tag added
2020-05-19 12:36:31 +05:30
rahulshukla-home 74a8b57801 Issue #3089 2020-05-19 12:25:40 +05:30
Pranshu Tomar c63d1d97f3 SEO optimization added for velocity and og tag added 2020-05-19 11:13:29 +05:30
Jitendra Singh 31571f94d5
Merge pull request #3084 from shubhwebkul/patch-2
Issue #3053 resolved
2020-05-18 20:50:48 +05:30
Jitendra Singh d42069d923
Merge pull request #3085 from shubhwebkul/patch-3
Issue #2994 #2973 resolved
2020-05-18 20:50:15 +05:30
Jitendra Singh 576c3af7ae
Merge pull request #3086 from rahulcs0082/development
Issue #3079
2020-05-18 20:49:33 +05:30
rahulshukla-home 5099687ebf Issue #3079 2020-05-18 18:47:00 +05:30
Shubham Mehrotra 2f481e4022 #2994 #2973 2020-05-18 17:11:52 +05:30
Shubham Mehrotra ccc24acdab #3053 2020-05-18 15:26:37 +05:30
Shubham Mehrotra 258009e050 remove previous changes 2020-05-18 15:25:03 +05:30
Shubham Mehrotra 77db0f6a48 remove extra changes 2020-05-18 14:46:19 +05:30
Shubham Mehrotra 7cf09f56ac remove extra changes 2020-05-18 14:44:13 +05:30
Shubham Mehrotra be644f6134 decoded uri in search 2020-05-18 14:35:16 +05:30
Shubham Mehrotra 1a91ef116f #3076 2020-05-18 12:59:23 +05:30
Jitendra Singh 2deb7aaf77
Merge pull request #3071 from rahulcs0082/development
change translation for #2794
2020-05-15 17:02:37 +05:30
Jitendra Singh 2ea98d4089
Merge pull request #3064 from kmso-de/feature/german-translation
Feature/german translation
2020-05-15 17:02:08 +05:30
rahulshukla-home 64ca06dc1d change translation for #2794 2020-05-15 13:03:37 +05:30
Jan Bickel 755874e0ae removed Validator.localize('de', de) & Vue.use(VeeValidate) 2020-05-15 07:51:53 +02:00
Jan Bickel 8eea8db266 german translation 2020-05-13 17:08:20 +02:00
Jitendra Singh c26a759fbc Added polish language 2020-05-13 20:22:25 +05:30
Roman Berneburg 03f8b6dc18 translations 2020-05-13 16:51:15 +02:00
Roman Berneburg f179925e5d translations "to" 2020-05-13 16:51:09 +02:00
Jan Bickel b1c3f7f3d0 german translations shop and admin 2020-05-13 16:49:40 +02:00
Jan Bickel 64e5f19861 german translations 2020-05-13 16:49:17 +02:00
Jan Bickel eae82352f7 german translations
# Conflicts:
#	packages/Webkul/Velocity/src/Resources/assets/js/app.js
2020-05-13 16:49:14 +02:00
Jan Bickel a8f8ecc23f added: files for translation 2020-05-13 16:44:53 +02:00
Jitendra Singh 7a84d81880
Merge pull request #3046 from rahulcs0082/development
Development
2020-05-13 12:51:44 +05:30
rahulshukla-home 72a1866b8d Issue #3044 2020-05-12 12:44:34 +05:30
ottopodo 909913870b Italian translation
Correct bug
2020-05-11 22:46:35 +02:00
ottopodo 9229e36175 Italian Translations 2020-05-11 19:19:28 +02:00
Shubham Mehrotra f446f1df19 process checkout if user not logged in 2020-05-07 12:31:45 +05:30
Shubham Mehrotra d2842a5ce6 responsive product gallery issue resolved 2020-05-05 22:08:32 +05:30
Shubham Mehrotra 9603befdec Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-30 17:21:46 +05:30
Shubham Mehrotra 235b0e6809 #2974 2020-04-30 17:21:41 +05:30
rahulshukla-home 40db94bf25 Issue #2969 2020-04-29 17:21:07 +05:30
rahulshukla-home 6118cabbde localization error message added in velocity theme 2020-04-29 13:55:04 +05:30
Jitendra Singh 10b05e58b1
Merge pull request #2955 from rahulcs0082/development
max price issue in category
2020-04-28 17:30:50 +05:30
rahulshukla-home abac3a297f max price issue in category 2020-04-28 14:40:08 +05:30
Shubham Mehrotra 2a5c65bcea Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-27 13:44:07 +05:30
Shubham Mehrotra 0242a0cf2e resolved issue with product images carousel 2020-04-27 13:43:22 +05:30
Jitendra Singh 30061b8f8d
Merge pull request #2924 from cagartner/added_new_events_to_core
Added new events to customer update and checkou, fixed some view rend…
2020-04-27 11:31:09 +05:30
Shubham Mehrotra deb9a4c38f content header path update 2020-04-24 16:40:39 +05:30
Shubham Mehrotra 1d7228ea54 #2919 2020-04-24 16:28:00 +05:30
Shubham Mehrotra 9361e9e77f removed layered navigation in searchproducts page 2020-04-24 15:26:20 +05:30
Shubham Mehrotra d439077228 customer sidebar menu issue resolved 2020-04-24 15:25:43 +05:30
Shubham Mehrotra b5b6532f3e #2908 2020-04-24 15:25:25 +05:30
Carlos Augusto Gartner 716345e378 Added new events to customer update and checkou, fixed some view render events and pt_BR grammar 2020-04-21 18:18:34 -03:00
Shubham Mehrotra ab50478351 update 2020-04-20 13:37:19 +05:30
Shubham Mehrotra bc94f318f5 update 2020-04-20 13:17:42 +05:30
Shubham Mehrotra 76a9ed1085 #2915 2020-04-20 13:03:31 +05:30
Shubham Mehrotra 1403364942 responsive cart count update 2020-04-20 12:19:15 +05:30
Shubham Mehrotra 9b6b3eedc3 variant products images update issue resolved 2020-04-18 00:29:39 +05:30
Shubham Mehrotra 53a12465f0 2875 update 2020-04-15 18:34:22 +05:30
Shubham Mehrotra 1f41b2ab06 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-15 17:47:29 +05:30
Shubham Mehrotra e4c96ad3a5 #2875 2020-04-15 13:08:11 +05:30
Jitendra Singh 7c7b99c901
Merge pull request #2882 from shubhwebkul/master
subcategory issue resolved
2020-04-14 12:08:28 +05:30
Shubham Mehrotra ef7d718d1f subcategory issue resolved 2020-04-14 11:05:25 +05:30
Jitendra Singh c71353ffc2
Merge pull request #2872 from cagartner/add_view_events
Added new view_render_event events
2020-04-13 16:01:09 +05:30
Shubham Mehrotra 21a62ff05a #2876 2020-04-13 13:36:16 +05:30
Shubham Mehrotra 8e93a3ffb8 calculate height on change value of dropdown 2020-04-13 11:20:48 +05:30
Shubham Mehrotra 4b03e79b86 #2866 2020-04-13 11:03:39 +05:30
Carlos Augusto Gartner e293fbfce2 Added more view_render_events in the customer account views 2020-04-12 21:36:37 -03:00
Jitendra Singh 8bee45f7f5
Merge pull request #2857 from shubhwebkul/master
misc. bug fixes
2020-04-10 11:13:02 +05:30
Shubham Mehrotra 72f11fb049 #2790 2020-04-09 20:19:36 +05:30
Shubham Mehrotra 9b56315f65 subcategory visibility issue in responsive 2020-04-09 19:58:25 +05:30
Shubham Mehrotra a1f4e1d66c #2849 2020-04-09 17:59:12 +05:30
rahulshukla-home 7cae8df9aa Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-04-09 17:31:12 +05:30
rahulshukla-home a1fa3f64e0 Issue #2794 2020-04-09 17:31:00 +05:30
Shubham Mehrotra 63b423da58 #2691 2020-04-09 17:24:45 +05:30
Shubham Mehrotra 187c99ce54 #2834 2020-04-09 13:26:33 +05:30
Shubham Mehrotra c2022a9b50 checkout page email validation 2020-04-08 18:55:20 +05:30
Shubham Mehrotra 9e768afa3c #2329 2020-04-07 13:57:01 +05:30
Shubham Mehrotra 804dc01512 compare page update height after loading images 2020-04-06 14:48:54 +05:30
Shubham Mehrotra 0e06a114af customer accordian design update 2020-04-06 10:46:11 +05:30
Shubham Mehrotra 26b0e253d1 customer panel accordian view and file picker view 2020-04-06 10:27:07 +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
Shubham Mehrotra bc838a2269 remove irrelevant xhr 2020-04-03 11:20:52 +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
Shubham Mehrotra efd96f8259 {git commit -m 2020-04-02 12:49:44 +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
Shubham Mehrotra dd88a81f92 remove line 2020-04-01 12:26:21 +05:30
Shubham Mehrotra 0005241794 misc. updates 2020-03-30 21:09:40 +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
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 23ddd66e7f #2750 2020-03-24 17:24:03 +05:30
Shubham Mehrotra 10c39a8de2 resolved conflicts 2020-03-24 16:45:56 +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
Jitendra Singh 80a342b20b
Merge pull request #2745 from shubhwebkul/patch-1
Issue #2610 resolved
2020-03-24 11:38:41 +05:30
rahulshukla-home f19206ab6e Issue #2593 fixed 2020-03-24 11:26:03 +05:30
Shubham Mehrotra 7e082f7aa3 #2610 2020-03-24 10:33:03 +05:30
Shubham Mehrotra 2ccf0271a2 #2713 2020-03-23 18:43:12 +05:30
Shubham Mehrotra 4b1abde920 wishlist products update logged-in customer 2020-03-23 17:49:21 +05:30