Commit Graph

4051 Commits

Author SHA1 Message Date
Annika Wolff 2748ba84ce add additional to all languages 2020-05-28 13:39:41 +02:00
Annika Wolff 566c65ef99 Merge 'master' into cart-rule-validator-extension 2020-05-28 13:36:13 +02:00
Annika Wolff 5f10981136 Merge 'master' of https://github.com/Haendlerbund/bagisto 2020-05-28 13:25:47 +02:00
Annika Wolff f53a6fba16 extend cart rule validation with search in cart item additional 2020-05-28 13:14:58 +02: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
rahulshukla-home e52cba981f Issue #3021 2020-05-27 22:09:17 +05:30
Jan Bickel b6048ea60a overlapping logo with menu icons (click action), built assets 2020-05-27 18:04:38 +02:00
rahulshukla-home b8417ff7d3 Issue #2804 2020-05-27 19:07:30 +05:30
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 23fd60cf2b
Merge pull request #3121 from Haendlerbund/copy-cart-rules
introduce the ability to copy a cart rule
2020-05-27 16:22:54 +05:30
Jitendra Singh 21eb34c64b
Merge pull request #3027 from Haendlerbund/bugfix-save-booking-products
#3026 fixed
2020-05-27 16:21:41 +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
Annika Wolff a22c2e02be introduce cronjob to automatically deactivate expired events 2020-05-27 11:31:35 +02:00
Shubham Mehrotra 9eb14326c4 #1522 2020-05-27 13:03:10 +05:30
Jitendra Singh c5cb04febf
Merge pull request #3112 from rahulcs0082/development
Development
2020-05-27 10:31:26 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Herbert Maschke 11fb120b51 adjust cart rule filter position a few pixels to align it as it is in products/index.blade.php 2020-05-25 08:31:12 +02:00
Annika Wolff 8a51417425 revert changes 2020-05-22 12:12:40 +02:00
Annika Wolff 5363b5645f revert changes 2020-05-22 12:09:19 +02:00
Steffen Mahler 5a7ec123c7 fix typo 2020-05-22 12:02:33 +02:00
Annika Wolff f42974f9e8 revert changes, add flag to config 2020-05-22 11:50:17 +02:00
Steffen Mahler 764df61509 trigger pipeline again 2020-05-22 09:57:34 +02:00
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 d664c92d30 trigger pipeline 2020-05-22 08:52:03 +02:00
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Jitendra Singh 8074168daa
Merge pull request #3105 from Haendlerbund/show-company-name-in-order-details-view
add field company_name to bliss views
2020-05-21 11:57:44 +05:30
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
Steffen Mahler d0d6f2b046 add field company_name to bliss views 2020-05-20 17:44:03 +02:00
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
rahulshukla-home 17ae225444 Issue #3067 fixed 2020-05-20 16:19:25 +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
Jitendra Singh 02faf5e610
Merge pull request #3098 from rahulcs0082/development
Issue #3095  fixed.
2020-05-20 12:25:09 +05:30
Pranshu Tomar b335321c45 Resolve conflicts 2020-05-20 12:22:31 +05:30
Pranshu Tomar 1dc4afc4ee Issue #3095 fixed 2020-05-20 12:21:16 +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
Jitendra Singh 4ef9e3b683
Merge pull request #3094 from rahulcs0082/development
Issue #3073
2020-05-19 19:20:11 +05:30
rahulshukla-home f3dd1e4d99 Issue #3073 2020-05-19 18:46:43 +05:30
Shubham Mehrotra 74357b56a7 #3076 2020-05-19 13:56:07 +05:30
Jitendra Singh 27420b5de0
Merge pull request #3074 from MattApril/bundle_item_ordering
Ordering bundle items in cart by sort_order rather than id
2020-05-19 12:45:24 +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 84aede5cef
Merge pull request #3088 from jitendra-webkul/1.0
Rich snippet feature added for products and category
2020-05-18 23:08:33 +05:30
Pranshu Tomar 94e4a165eb Added translations to other languages 2020-05-18 23:07:12 +05:30
Pranshu Tomar 072b56930b Rich snippet feature added for products and category 2020-05-18 23:04:09 +05:30
Jitendra Singh ff49583f81
Merge pull request #3078 from MattApril/product_sorting
Products: Fix for missing or invalid sort direction
2020-05-18 20:59:47 +05:30
Jitendra Singh 3e894fc3da
Merge pull request #2999 from MattApril/fix_broken_state_taxes
Fixed undefined $state variable when using State based tax rates.
2020-05-18 20:56:50 +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
Matt April 1f5e7c0daa Fix for missing or invalid sort direction 2020-05-15 15:49:15 -04:00
Matt April 9013fd6b95 Ordering bundle items in cart by sort_order rather than id 2020-05-15 11:00:31 -04:00
Jitendra Singh 782c369e28
Merge pull request #3069 from jitendra-webkul/1.0
Issue #2762 fixed
2020-05-15 17:02:57 +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 eb5de5acdf added localize to admin 2020-05-15 07:56:41 +02:00
Jan Bickel 755874e0ae removed Validator.localize('de', de) & Vue.use(VeeValidate) 2020-05-15 07:51:53 +02:00
Pranshu Tomar 61a585c5d1 Issue #2762 fixed 2020-05-14 18:06:34 +05:30
rahulshukla-home e4c1b65bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-13 22:28:17 +05:30
rahulshukla-home 426ea4d802 Issue #3050 2020-05-13 22:27:42 +05:30
Pranshu Tomar dabb4840f0 Issue #2764 fixed 2020-05-13 22:14:42 +05:30
Pranshu Tomar 1094307786 Issue #2764 fixed 2020-05-13 22:13:02 +05:30
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 54b535f8f4 customer german translation
# Conflicts:
#	packages/Webkul/Customer/src/Resources/lang/de/app.php
2020-05-13 16:50:25 +02:00
Roman Berneburg 05c3012eda german translations for Customer, Admin, Shop 2020-05-13 16:49:49 +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
Roman Berneburg a1f4a29b28 translation 2020-05-13 16:46:50 +02:00
Roman Berneburg 74dfa77cd0 translation 2020-05-13 16:45:45 +02:00
Jan Bickel 23900807ea ui german translation 2020-05-13 16:45:33 +02:00
Jan Bickel 35948d7acb admin german translation 2020-05-13 16:45:18 +02:00