Commit Graph

4751 Commits

Author SHA1 Message Date
Vivek Sharma b2463a6af5 [Revert changes] 2020-02-11 12:29:33 +05:30
Vivek Sharma 0f03c184b4 [Saved] 2020-02-11 12:14:53 +05:30
Vivek Sharma bb9e6d5e5a [Fixed: conflict resolved.] 2020-02-11 11:58:44 +05:30
Vivek Sharma c880879f5f [Fixed: conflict resolved.] 2020-02-11 11:38:42 +05:30
Jitendra Singh 3d9eb5f91f
Merge pull request #2414 from vivek-webkul/patch-29
[Fixed: Issue #2397 has been resolved.]
2020-02-11 11:10:11 +05:30
Jitendra Singh 2fce1383ce
Merge pull request #2413 from vivek-webkul/patch-28
[Fixed: Issue #2410 has been resolved.]
2020-02-11 11:09:58 +05:30
Jitendra Singh f8ef2d85e8
Merge pull request #2409 from vivek-webkul/patch-27
[Fixed: Issue #2399 has been resolved.]
2020-02-11 11:09:32 +05:30
Jitendra Singh f2666c4c8f
Merge pull request #2407 from vivek-webkul/patch-25
[Fixed: Issue #2402 has been resolved.]
2020-02-11 11:09:11 +05:30
Jitendra Singh 86e86db559
Merge pull request #2404 from vivek-webkul/patch-22
[Fixed: issue #2381 has been resolved.]
2020-02-11 11:08:17 +05:30
Jitendra Singh 6204d5ad42
Merge pull request #2401 from vivek-webkul/patch-21
[Fixed: issue #2386 has been resolved.]
2020-02-11 11:07:48 +05:30
Jitendra Singh 25b0973a4d
Merge pull request #2396 from vivek-webkul/patch-20
[Fixed: issue #2391 has been fixed.]
2020-02-11 11:07:22 +05:30
Jitendra Singh 66e398817d
Merge pull request #2394 from vivek-webkul/patch-19
[Fixed: #2390 and #2389 have been resolved.]
2020-02-11 11:06:44 +05:30
Jitendra Singh ca864b2d8a
Merge pull request #2383 from vivek-webkul/patch-16
[Fixed: issue #2329 has been resolved.]
2020-02-11 11:05:59 +05:30
Jitendra Singh b7537d9578
Merge pull request #2376 from shubhwebkul/velocity-updated
misc. bug fixes
2020-02-11 11:05:00 +05:30
Jitendra Singh 9b738f60bb
Merge pull request #2375 from shivam-webkul/master
#2070 issue fixed
2020-02-11 10:50:51 +05:30
Herbert Maschke c27b70b420 load correct locale in CategoryController.php 2020-02-10 15:21:03 +01:00
Herbert Maschke d574ab1beb Merge branch 'bagisto/master' into locale-improvements 2020-02-10 15:11:43 +01:00
Herbert Maschke 45160d2099 fix some javascript i have destroyed previously accidentally 2020-02-10 15:07:14 +01:00
Herbert Maschke 38dbb6384d obey the default channel and configured default locale in product edit form 2020-02-10 15:05:03 +01:00
shubhammehrotra.symfony@webkul.com cd83d6bbcc misc. updates 2020-02-10 19:06:45 +05:30
Vivek Sharma dd58890395 [Fixed: Issue #2397 has been resolved.] 2020-02-10 13:48:44 +05:30
Vivek Sharma ffea130723 [Fixed: Issue #2410 has been resolved.] 2020-02-10 13:28:22 +05:30
shubhammehrotra.symfony@webkul.com 6f37c37dd1 resolved conflicts 2020-02-10 12:25:22 +05:30
Vivek Sharma ae6ab80d1e Merge pull request #2379 from rahulshukla-webkul/development
Issue #2377
2020-02-10 10:51:31 +05:30
Vivek Sharma 04ed1bbb87 Merge pull request #2392 from vivek-webkul/patch-18
[Fixed: issue #2384 has been resolved.]
2020-02-10 10:45:42 +05:30
Steffen Mahler 59f1956a21 merge bagisto/master into fix-tax-handling 2020-02-08 20:48:27 +01:00
Steffen Mahler 7dff220da9 fix issue with zip based taxes, added functional test 2020-02-08 20:42:32 +01:00
shubhammehrotra.symfony@webkul.com 8fc51a7be4 rtl updates 2020-02-08 19:00:58 +05:30
shubhammehrotra.symfony@webkul.com 5a6289d4ce rtl updates 2020-02-08 19:00:25 +05:30
Vivek Sharma 57ddb147c3 [Fixed: Extra line removed from product page.] 2020-02-08 18:37:50 +05:30
Vivek Sharma 2706e8a181 [Fixed: Issue #2399 has been resolved.] 2020-02-08 18:33:51 +05:30
Vivek Sharma fb696d27e5 [Fixed: Issue #2400 has been resolved.] 2020-02-08 18:17:52 +05:30
Vivek Sharma b95636e2ec [Fixed: Issue #2402 has been resolved.] 2020-02-08 17:38:33 +05:30
Vivek Sharma 0e9af6b00a [Fixed: Issue #2403 has been resovled.] 2020-02-08 17:28:42 +05:30
Vivek Sharma 8a955e3b14 [Fixed: issue #2322 has been resolved.] 2020-02-08 16:29:09 +05:30
Vivek Sharma c0d2dc83d0 [Fixed: issue #2381 has been resolved.] 2020-02-08 15:33:59 +05:30
Vivek Sharma af1ebddeef [Fixed: issue #2386 has been resolved.] 2020-02-08 15:10:37 +05:30
Vivek Sharma 4edbd82967 [Fixed: issue #2391 has been fixed.] 2020-02-08 13:46:48 +05:30
Vivek Sharma 63556473c8 [Fixed: #2390 and #2389 have been resolved.] 2020-02-08 13:22:49 +05:30
Vivek Sharma d2a2b2a8c6 [Fixed: issue #2384 has been resolved.] 2020-02-08 12:59:08 +05:30
Vivek Sharma 62876ea703 [Fixed: issue #2378 has been resolved.] 2020-02-08 11:40:29 +05:30
Steffen Mahler 00c43e21de cleanup 2020-02-07 19:23:15 +01:00
Steffen Mahler 1d08f8a1f5 extend API endpoint for Cart by taxes 2020-02-07 19:09:41 +01:00
Vivek Sharma ceccbf9db2 [Fixed: issue #2329 has been resolved.] 2020-02-07 18:57:46 +05:30
Vivek Sharma e78e61d989 Merge remote-tracking branch 'upstream/master' 2020-02-07 18:52:17 +05:30
shaiv-webkul b7f722a3c4 #2364 issue fixed 2020-02-07 18:23:31 +05:30
rahul shukla 178ca4af74 Logic improvement 2020-02-07 17:20:55 +05:30
rahul shukla d39201c877 Issue #2377 2020-02-07 17:17:30 +05:30
shivam kumar 15a6a25256 #2070 issue fixed 2020-02-07 16:40:03 +05:30
shubhammehrotra.symfony@webkul.com af8e3e77b9 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-07 16:37:28 +05:30