Commit Graph

619 Commits

Author SHA1 Message Date
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
Shubham Mehrotra 59ba5a56f9 #2732 #2579 2020-03-23 14:14:11 +05:30
Shubham Mehrotra 198088f728 responsive console error resolved 2020-03-23 10:56:27 +05:30
Shubham Mehrotra c1d39a22f4 product card default image 2020-03-20 16:41:18 +05:30
Shubham Mehrotra 5e82c8c1e6 responsive cart page update 2020-03-20 15:05:44 +05:30
Shubham Mehrotra b7ccb5c214 #2640 2020-03-20 13:25:49 +05:30
Jitendra Singh 0f827ff64c
Merge pull request #2699 from shubhwebkul/velocity-updated
Issue #2592 Resolved
2020-03-19 18:53:05 +05:30
shubhammehrotra.symfony@webkul.com 7de8e6a0d4 misc. updates 2020-03-19 18:45:43 +05:30
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
shubhammehrotra.symfony@webkul.com 3e2dd34ddd #2592 2020-03-19 17:57:52 +05:30
Jitendra Singh edee5c2f16
Merge pull request #2696 from shubhwebkul/velocity-updated
misc. bug fixes
2020-03-19 16:53:54 +05:30
shubhammehrotra.symfony@webkul.com 9f45675399 remove debugger 2020-03-19 16:44:12 +05:30
shubhammehrotra.symfony@webkul.com c80bf519e8 #2693, #2641 2020-03-19 16:39:29 +05:30
shubhammehrotra.symfony@webkul.com 787304b6f2 quick view update 2020-03-19 11:25:05 +05:30
rahul shukla d9a391f1cc Issue #2593 fixed 2020-03-18 16:15:33 +05:30
shubhammehrotra.symfony@webkul.com c06aeadb37 product add to cart issue resolved on PDP 2020-03-17 15:48:10 +05:30
shubhammehrotra.symfony@webkul.com d5b1e84fdb #2678 2020-03-17 14:00:07 +05:30
shubhammehrotra.symfony@webkul.com 32701de737 #2666 2020-03-17 13:34:44 +05:30
shubhammehrotra.symfony@webkul.com ca4ae665f1 #2667 2020-03-17 13:13:24 +05:30
shubhammehrotra.symfony@webkul.com f354d0aafa shimmer effect added in wishlist and comparison 2020-03-17 11:44:22 +05:30
mohd asif 47c4a5ef42 upadated missing translation for dutch and protoguese in velocity package 2020-03-17 10:12:33 +05:30
mohd asif d2caa2af98 resolved commit 2020-03-17 09:36:45 +05:30
shubhammehrotra.symfony@webkul.com ce90035edb hide compare, wishlist icon 2020-03-16 18:52:37 +05:30
shubhammehrotra.symfony@webkul.com 61f949f43e #2646 2020-03-16 18:46:56 +05:30
shubhammehrotra.symfony@webkul.com bc362144c3 added shimmer effect product cards 2020-03-16 16:33:53 +05:30
shubhammehrotra.symfony@webkul.com cc12549336 #2636 2020-03-16 13:40:21 +05:30
shubhammehrotra.symfony@webkul.com ee4f81004c #2639 2020-03-16 13:34:01 +05:30
mohd asif 4c1f1ff738 translation updated for the velocity package 2020-03-13 14:52:30 +05:30
mohd asif f797456d1a added missing translation for the arabic of velocity packages 2020-03-12 17:39:17 +05:30
mohd asif 54d8ff9487 added tranlation fa for velocity package 2020-03-12 16:09:05 +05:30
Vivek Sharma ffd918af20 [Updated: Changed Velocity's models related code.] 2020-03-07 11:43:22 +05:30
Jitendra Singh 2f9724e03d attributeOptionRepository undefined variable issue fixed 2020-03-06 17:47:20 +05:30
Jitendra Singh fcf043ca6f Improved code style 2020-03-06 16:09:53 +05:30
Jitendra Singh 73ce8a4dd7 Resolved conflicts 2020-03-06 16:04:17 +05:30
Jitendra Singh 010ae65691 Resolved conflicts 2020-03-06 16:02:52 +05:30
shubhammehrotra.symfony@webkul.com 5ad2b9109f use product flat instead of product entity 2020-03-06 14:41:33 +05:30
shubhammehrotra.symfony@webkul.com d212536170 image resolution & quick view price issue resolved 2020-03-06 13:24:31 +05:30
shubhammehrotra.symfony@webkul.com b564e63ad7 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-03-06 12:26:13 +05:30
shubhammehrotra.symfony@webkul.com 8d167c7b76 #2609, #2602 & misc. 2020-03-06 12:25:59 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh d0fa3b2705 Replace DB alias with complete class name 2020-03-05 19:11:53 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
rahul shukla b024a0b176 Issue #2606 2020-03-05 16:44:52 +05:30
shubhammehrotra.symfony@webkul.com 46ad282d2f misc. minor updates 2020-03-05 14:00:27 +05:30
shubhammehrotra.symfony@webkul.com 6d0157fd84 misc. minor updates 2020-03-05 13:44:58 +05:30
shubhammehrotra.symfony@webkul.com 85b5261e4b misc. minor updates 2020-03-05 13:44:34 +05:30
shubhammehrotra.symfony@webkul.com 133dd6ebd4 velocity sidebar issue and default theme velocity update 2020-03-04 13:12:00 +05:30
shubhammehrotra.symfony@webkul.com e5afdf23cb card minor update 2020-03-04 12:35:00 +05:30
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
shubhammehrotra.symfony@webkul.com 1713cf8c03 misc. updates 2020-03-04 11:41:09 +05:30
shubhammehrotra.symfony@webkul.com d09c4b0ea7 misc. updates 2020-03-03 20:31:43 +05:30
Jitendra Singh 45ec4532fa Resolved conflicts 2020-03-03 15:59:47 +05:30
shubhammehrotra.symfony@webkul.com 253131668b initial for guest customer wishlist 2020-03-03 11:53:11 +05:30
shubhammehrotra.symfony@webkul.com 8a1ab165da ajaxified add to cart, modified controllers 2020-03-02 16:54:38 +05:30
shubhammehrotra.symfony@webkul.com 8b2c955dd3 mini-cart component added 2020-03-01 18:46:32 +05:30
shubhammehrotra.symfony@webkul.com a750509948 #2580, #2579 2020-03-01 16:39:17 +05:30
shubhammehrotra.symfony@webkul.com 34f944f5aa misc. bug fixes 2020-03-01 11:03:44 +05:30
Shubham Mehrotra c943a42a65 misc. bug fixes 2020-02-29 15:50:23 +05:30
Shubham Mehrotra ab612d064f misc. bug fixes 2020-02-29 15:35:50 +05:30
shubhammehrotra.symfony@webkul.com a752e58ed1 resolved issues 2020-02-28 18:59:15 +05:30
shubhammehrotra.symfony@webkul.com db2d2e8079 drop table wrong name issue 2020-02-28 17:31:57 +05:30
shubhammehrotra.symfony@webkul.com f1bf2d6e17 revised naming convention 2020-02-28 17:30:30 +05:30
shubhammehrotra.symfony@webkul.com c5c1c9154a product compare updates 2020-02-28 17:23:01 +05:30
shubhammehrotra.symfony@webkul.com 772cdbd2ba product image issue fixed 2020-02-28 09:32:47 +05:30
shubhammehrotra.symfony@webkul.com 721d4c8141 minor bug fixes 2020-02-27 20:14:28 +05:30
shubhammehrotra.symfony@webkul.com 4df1895a38 minor bug fixes 2020-02-27 20:14:14 +05:30
shubhammehrotra.symfony@webkul.com b83ea26915 minor bug fixes 2020-02-27 19:37:37 +05:30
shubhammehrotra.symfony@webkul.com f5c45972db minor bug fixes 2020-02-27 17:31:21 +05:30
shubhammehrotra.symfony@webkul.com 4485d3fb9c changes from master 2020-02-27 16:16:38 +05:30
shubhammehrotra.symfony@webkul.com 87f801dbce changes from master 2020-02-27 16:16:29 +05:30
shubhammehrotra.symfony@webkul.com 13312e8234 compare product's dynamic attributes 2020-02-27 16:14:00 +05:30
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 7d2ff93f43 Resolve conflicts 2020-02-25 11:44:34 +05:30
Jitendra Singh 9eb7113aa4 Fixed else if indentation in javascript 2020-02-24 18:53:34 +05:30
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30
Jitendra Singh 8bdadf7a38
Merge pull request #2545 from shubhwebkul/bug-fixes
[Velocity] product view page add to cart button issue resolved
2020-02-24 13:46:38 +05:30
shubhammehrotra.symfony@webkul.com 9b2dc0b8c7 product view add to cart button issue resolved 2020-02-24 13:43:21 +05:30
Jitendra Singh e552183e9a
Merge pull request #2523 from ghermans/dutch
#2512 - Dutch translations and removing static text
2020-02-24 13:34:27 +05:30
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
rahul shukla 30cb18c1f5 Issue #2538 fixed and change log updated 2020-02-21 17:45:47 +05:30
Glenn Hermans 0f233f08fe Updating translations 2020-02-21 12:36:26 +01:00
Glenn Hermans fc84c4a047 #2512 - Added more shop translations 2020-02-21 11:23:46 +01:00
rahul shukla 78e50e4e6b tax in velocity theme 2020-02-21 15:38:42 +05:30
ghermans d4ce50da9f #2512 more translations 2020-02-21 09:44:12 +01:00
ghermans 283c6e437c #2512 starting to translate the shop files 2020-02-21 09:30:04 +01:00
Jitendra Singh 35522da97d
Merge pull request #2532 from rahulshukla-webkul/development
change log updated
2020-02-21 12:02:47 +05:30
rahul shukla 5ad6afd298 change log updated 2020-02-21 11:58:33 +05:30
Jitendra Singh fa68e2ad2a
Merge pull request #2531 from rahulshukla-webkul/development
cart product quantity for bundle product in velocity and change log …
2020-02-21 11:03:01 +05:30
rahul shukla c87562622b cart product quantitiy for bundle product in velocity and change log updated 2020-02-21 10:53:59 +05:30
Jitendra Singh f3c19efa26
Merge pull request #2528 from rahulshukla-webkul/development
Issue #2526
2020-02-20 19:54:32 +05:30
rahul shukla 9937f52de2 Issue #2526 2020-02-20 19:50:27 +05:30
Jitendra Singh d8bd2cb31e
Merge pull request #2520 from shubhwebkul/bug-fixes
quick view short description issue
2020-02-20 16:44:03 +05:30
rahul shukla 66ba69586d filter issue in category 2020-02-20 16:31:46 +05:30
shubhammehrotra.symfony@webkul.com ac3a093687 quick view short description issue 2020-02-20 16:12:23 +05:30
shubhammehrotra.symfony@webkul.com b56dc467f9 compare minor updates 2020-02-20 15:38:19 +05:30
Jitendra Singh 96cba32d8b Improved velocity package code style 2020-02-20 13:08:52 +05:30
shubhammehrotra.symfony@webkul.com 179cac23ce guest customer compare item 2020-02-20 12:58:49 +05:30
shubhammehrotra.symfony@webkul.com 9480b95d00 compare items updates 2020-02-20 10:56:11 +05:30
shubhammehrotra.symfony@webkul.com e16fad3ac8 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-19 18:59:52 +05:30
shubhammehrotra.symfony@webkul.com a11c8e67b0 compare product updates 2020-02-19 18:59:38 +05:30
rahul shukla d62b61b19c Issue #2463 2020-02-19 16:12:54 +05:30
rahul shukla 33f882209a code improvement 2020-02-19 15:32:52 +05:30
Jitendra Singh a48be0f32a
Merge pull request #2499 from prateek-webkul/master
issue #2479 fixed
2020-02-19 10:48:29 +05:30
prateek srivastava 9fe52991ac issue #2479 fixed 2020-02-18 20:18:01 +05:30
shubhammehrotra.symfony@webkul.com ea4f1a15d8 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-18 17:34:38 +05:30
shubhammehrotra.symfony@webkul.com 60a03e3b28 misc. updates 2020-02-18 17:34:19 +05:30
prateek srivastava 2203c3ff05 issue #2479 fixed 2020-02-18 13:39:50 +05:30
shubhammehrotra.symfony@webkul.com 22b80d0904 carousel in quick view 2020-02-18 11:52:37 +05:30
shubhammehrotra.symfony@webkul.com 9ee02d5f96 quick view & misc. bug fixes 2020-02-18 10:57:39 +05:30
shubhammehrotra.symfony@webkul.com e90193d476 misc. bug fixes 2020-02-14 16:48:57 +05:30
shubhammehrotra.symfony@webkul.com fccfbededb Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-13 20:37:52 +05:30
shubhammehrotra.symfony@webkul.com 1eb2aaf447 payment method update issue fixed 2020-02-13 20:37:21 +05:30
shubhammehrotra.symfony@webkul.com 7109998c3c updates 2020-02-13 20:23:36 +05:30
Jitendra Singh 5b032c2f5e
Merge pull request #2460 from shubhwebkul/velocity-updated
WIP: misc. updates
2020-02-13 19:01:55 +05:30
shubhammehrotra.symfony@webkul.com 78c3b98869 misc. updates 2020-02-13 18:56:26 +05:30
shubhammehrotra.symfony@webkul.com 986eb1f929 misc. updates 2020-02-13 18:37:58 +05:30
Jitendra Singh 5a6549f7ab
Merge pull request #2456 from shubhwebkul/velocity-updated
checkout misc. bug fixes
2020-02-13 15:57:34 +05:30
shubhammehrotra.symfony@webkul.com c85813de37 checkout updates 2020-02-13 15:29:33 +05:30
Vivek Sharma 0219862de0 [Fixed: issue #2440 resolved.] 2020-02-13 14:00:59 +05:30
shubhammehrotra.symfony@webkul.com dc1888fceb assets 2020-02-12 19:18:23 +05:30
shubhammehrotra.symfony@webkul.com 98cdcfed10 merged conflicts 2020-02-12 19:17:20 +05:30
shubhammehrotra.symfony@webkul.com 25e3da0fa7 misc. bug fixes 2020-02-12 19:15:34 +05:30
rahul shukla f738cf4240 Issue #2439 2020-02-12 17:52:54 +05:30
Vivek Sharma c9e6baff5d [Fixed: issue #2440 has been resolved.] 2020-02-12 17:11:21 +05:30
Vivek Sharma b6ab1b0f99 [Fixed: layout issue #2381 resolved.] 2020-02-12 16:46:06 +05:30
Vivek Sharma 7098e651d3 [Fixed: layout issue #2381 resolved.] 2020-02-12 16:42:40 +05:30
Vivek Sharma 8db782bacf [Fixed: issue #2436 has been resolved.] 2020-02-12 15:13:07 +05:30
Jitendra Singh 8550c0424f
Merge pull request #2442 from shubhwebkul/velocity-updated
checkout page updates
2020-02-12 13:20:42 +05:30
shubhammehrotra.symfony@webkul.com 3d3fa3408c checkout page updates 2020-02-12 13:18:24 +05:30
Jitendra Singh a6790b97d1 Issue #2438 fixed 2020-02-12 13:07:17 +05:30
Jitendra Singh ae8c9311cb
Merge pull request #2431 from vivek-webkul/patch-32
[Fixed: layout issue regarding #2399 resolved.]
2020-02-11 19:13:55 +05:30
Vivek Sharma 31b7db34cb [Fixed: layout issue regarding #2399 resolved.] 2020-02-11 18:59:35 +05:30
Vivek Sharma bef1068d70 Fixed: button alignment corrected. 2020-02-11 18:40:58 +05:30
shubhammehrotra.symfony@webkul.com 4323637bf9 minor bugs 2020-02-11 18:15:06 +05:30
shubhammehrotra.symfony@webkul.com afa4ea627c Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 17:50:03 +05:30
shubhammehrotra.symfony@webkul.com d331c36bd8 misc. bug fixes 2020-02-11 17:49:48 +05:30
Jitendra Singh fe911cc2dc Issue #2398 fixed 2020-02-11 17:16:10 +05:30
Jitendra Singh df88b605be Issue #2416 fixed 2020-02-11 15:18:33 +05:30
Jitendra Singh 37d99c526f Issue #2417 fixed 2020-02-11 15:08:41 +05:30
Jitendra Singh 66f29937e9
Merge pull request #2405 from vivek-webkul/patch-23
[Fixed: issue #2322 has been resolved.]
2020-02-11 13:54:12 +05:30
Jitendra Singh b2b90d566a
Merge pull request #2380 from shaiv-webkul/master
#2364 issue fixed
2020-02-11 13:43:55 +05:30
Vivek Sharma 52ac7f8aaa [resolved conflict.] 2020-02-11 13:42:04 +05:30
Vivek Sharma b3b830e094 [Saved.] 2020-02-11 13:40:12 +05:30
Vivek Sharma 1fa7f93c2d [Saved.] 2020-02-11 13:38:03 +05:30
Vivek Sharma 424a0a1595 [Saved.] 2020-02-11 13:36:38 +05:30
shubhammehrotra.symfony@webkul.com 081a90d3d0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 13:34:48 +05:30
shubhammehrotra.symfony@webkul.com 77e63a51b5 publishable assets issue resolved 2020-02-11 13:34:31 +05:30
Vivek Sharma 4c574a26ff [Fixed: changes card blade file.] 2020-02-11 13:30:54 +05:30
Vivek Sharma 213a622fec [Saved] 2020-02-11 13:29:22 +05:30
Vivek Sharma 817d46bb89 [Fixed: conflict resolved.] 2020-02-11 13:23:21 +05:30
Jitendra Singh 3f3962681b
Merge pull request #2385 from vivek-webkul/patch-17
[Fixed: issue #2378 has been resolved.]
2020-02-11 12:35:17 +05:30
Vivek Sharma 7ad61082c3 [Fixed: changes added.] 2020-02-11 12:31:18 +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 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
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
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
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 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
Vivek Sharma ceccbf9db2 [Fixed: issue #2329 has been resolved.] 2020-02-07 18:57:46 +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
shubhammehrotra.symfony@webkul.com ae63bfd3c2 checkout updates 2020-02-07 16:37:01 +05:30
shubhammehrotra.symfony@webkul.com 432bb60570 velocity admin panel bugs 2020-02-07 16:01:52 +05:30
shubhammehrotra.symfony@webkul.com 79a8faa028 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-07 15:22:29 +05:30
shubhammehrotra.symfony@webkul.com 6962d4df0d misc. resolved issues 2020-02-07 15:22:05 +05:30
rahul shukla 3504226a6a Issue #2366 2020-02-07 15:04:00 +05:30
rahul shukla 0358a84a2c Issue #2357 2020-02-07 13:49:01 +05:30
rahul shukla 2ad1ab3f79 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-07 11:06:06 +05:30
rahul shukla 84f8c9fb71 Issue #2328 2020-02-07 11:03:28 +05:30
shubhammehrotra.symfony@webkul.com d6e6419c9c reset password page updates 2020-02-07 10:26:47 +05:30
shubhammehrotra.symfony@webkul.com cde599c7a2 reset-password page updates 2020-02-06 21:23:58 +05:30
shubhammehrotra.symfony@webkul.com 5cbb6fc23e #2249 2020-02-06 21:17:59 +05:30
shubhammehrotra.symfony@webkul.com f7bea02c4e misc. bug fixes 2020-02-06 21:13:02 +05:30
shubhammehrotra.symfony@webkul.com 8ee5d3db83 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-06 19:57:30 +05:30
Jitendra Singh e703bd7e2c
Merge pull request #2349 from vivek-webkul/patch-15
[Fixed: issue #2346 resolved.]
2020-02-06 19:57:15 +05:30
shubhammehrotra.symfony@webkul.com 64692f6e3c misc. bug fixes 2020-02-06 19:57:13 +05:30
Vivek Sharma ba775a14e5 [Fixed: issue #2346 resolved.] 2020-02-06 19:56:21 +05:30
Jitendra Singh 8bf70ecbc9
Merge pull request #2345 from jitendra-webkul/1.0
Issue #2339 fixed
2020-02-06 19:17:13 +05:30
Jitendra Singh 1a3bc44a88 Issue #2339 fixed 2020-02-06 19:16:22 +05:30