Commit Graph

5290 Commits

Author SHA1 Message Date
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
Jan Bickel a8f8ecc23f added: files for translation 2020-05-13 16:44:53 +02:00
Jitendra Singh 55222cb8df
Merge pull request #3060 from rahulcs0082/development
Development
2020-05-13 18:02:50 +05:30
rahulshukla-home 457d491ebd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-13 17:52:40 +05:30
rahulshukla-home dda2314152 Issue #3051 2020-05-13 17:51:47 +05:30
Jitendra Singh af93b1816a
Merge pull request #3059 from jitendra-webkul/1.0
Updated composer.lock file
2020-05-13 17:42:47 +05:30
Pranshu Tomar 7e4e979799 Updated composer.lock file 2020-05-13 17:37:15 +05:30
Jitendra Singh be3348bb03
Merge pull request #3058 from jitendra-webkul/1.0
Issue #3048 fixed
2020-05-13 17:33:03 +05:30
Pranshu Tomar eb109b2aee Issue #3048 fixed 2020-05-13 17:21:44 +05:30
Jitendra Singh e5fef36e26
Merge pull request #3057 from jitendra-webkul/1.0
Issue #3054 fixed
2020-05-13 17:08:06 +05:30
Pranshu Tomar 020df01980 Issue #3054 fixed 2020-05-13 16:53:25 +05:30
Jitendra Singh f3a49b35de
Merge pull request #3033 from Haendlerbund/flexible-exception-handling
Improve exception handler
2020-05-13 12:53:44 +05:30
Jitendra Singh 4af22ad5df
Merge pull request #3034 from Haendlerbund/fix-namespace-issues
fix namespace issues
2020-05-13 12:53:21 +05:30
Jitendra Singh afa4d5068a
Merge pull request #3023 from MattApril/product_filtering_performance
Rebuilt product filter query for improved performance.
2020-05-13 12:53:12 +05:30
Jitendra Singh 5630e0ee5d
Merge pull request #3003 from Haendlerbund/fix-bugs-extend-test
various fixes for cart rules and taxes
2020-05-13 12:52:41 +05:30
Jitendra Singh 7a84d81880
Merge pull request #3046 from rahulcs0082/development
Development
2020-05-13 12:51:44 +05:30
Jitendra Singh 3687ed2956
Merge pull request #3045 from ottopodo/master
Italian Translations
2020-05-13 12:44:26 +05:30
rahulshukla-home 39965792aa Issue #3020 and 3024 2020-05-13 11:18:05 +05:30
Steffen Mahler 15320934b4 fix issue with coupons with same code 2020-05-12 16:43:56 +02:00
rahulshukla-home 18e4af0356 Issue #3047 2020-05-12 14:23:41 +05:30
rahulshukla-home eefa67ff6b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-12 12:45:30 +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
Jitendra Singh 8df7fbc23b
Merge pull request #3039 from rahulcs0082/development
Development
2020-05-11 16:36:00 +05:30
rahulshukla-home 1ddc2b42d7 Issue #3041 2020-05-11 14:51:06 +05:30
rahulshukla-home 9fb5d2f75e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-11 09:52:02 +05:30
rahulshukla-home 3af919ee5f Issue #3024 2020-05-11 09:51:37 +05:30
Florian Bosdorff 6a8db1ea9b fix CustomerCest 2020-05-09 12:46:11 +02:00
Florian Bosdorff 33ddae27ae fix namespace issues 2020-05-09 12:38:20 +02:00
Florian Bosdorff 48e0026ec2 fix typo 2020-05-09 12:29:34 +02:00
Florian Bosdorff 85ef3fe69b remove unused exception handler; make exception handler extendable 2020-05-09 12:21:54 +02:00
Jitendra Singh eb527f34e8
Merge pull request #3031 from jitendra-webkul/1.0
Added configuration for category page toolbar
2020-05-08 21:59:09 +05:30
Pranshu Tomar 527affe741 Resolved conflicts 2020-05-08 21:50:06 +05:30
Pranshu Tomar cdf637f833 Added configuration for category page toolbar 2020-05-08 21:47:47 +05:30
Jitendra Singh 6ac17965dc
Merge pull request #3028 from vivek-webkul/patch-43
[Updated: Address's contract, model and proxy classes.]
2020-05-08 13:44:15 +05:30
Vivek 433a2b68df [Updated: Address's contract, model and proxy classes.] 2020-05-08 12:18:43 +05:30
Matt April 17b3f6bb93 Rebuilt product filter query for improved performance. 2020-05-07 20:47:20 -04:00
Jitendra Singh c0fb97bf80
Merge pull request #3019 from jitendra-webkul/1.0
Version details added in menu
2020-05-07 20:17:23 +05:30
Pranshu Tomar b0a811462f Version details added in menu 2020-05-07 20:12:06 +05:30
Jitendra Singh 071fc16e13
Merge pull request #3016 from shubhwebkul/master
checkout update
2020-05-07 15:21:00 +05:30
Jitendra Singh ad306f7c3f
Merge pull request #3017 from jitendra-webkul/1.0
Order comment email sent to customer
2020-05-07 14:24:57 +05:30
Pranshu Tomar 0893513b60 Order comment email sent to customer 2020-05-07 13:58:14 +05:30
Jitendra Singh 4b31626930
Merge pull request #2998 from MattApril/product_price_spacing_fix
Added missing space for configurable/grouped product price.
2020-05-07 12:34:25 +05:30
Shubham Mehrotra f446f1df19 process checkout if user not logged in 2020-05-07 12:31:45 +05:30
Jitendra Singh 45e61682cd
Merge pull request #3013 from jitendra-webkul/1.0
Order comment feature added
2020-05-06 22:52:09 +05:30