Commit Graph

6870 Commits

Author SHA1 Message Date
rahulshukla-home ac13fa872f test case updated 2020-10-15 18:37:28 +05:30
rahulshukla-home 63411edbaf test case failure 2020-10-15 18:16:45 +05:30
Jitendra Singh 4f988d107b
Merge pull request #4076 from vishal-webkul/issue-4035-2
Issue #4035 Fixed in Default Theme
2020-10-15 11:31:54 +05:30
Jitendra Singh 1912651c0e
Merge pull request #4069 from devansh-webkul/guest_functionality_removal
Wishlist Functionality For Guest Removed
2020-10-15 11:30:51 +05:30
devansh bawari 4d33f93914 Guest Routes Removed 2020-10-14 12:16:11 +05:30
vishal.kushwaha650 fb78211662 fix booking product view 2020-10-14 10:51:55 +05:30
devansh bawari 90a1dce778 Recompiled 2020-10-14 10:03:07 +05:30
devansh bawari a77ee61c06 Merge branch 'master' into guest_functionality_removal 2020-10-14 10:01:11 +05:30
Jitendra Singh 109562057e
Merge pull request #4078 from jitendra-webkul/master
Added image lazyloading in velocity theme
2020-10-13 19:56:13 +05:30
jitendra 76b99cb965 Conflics resolved 2020-10-13 19:55:45 +05:30
jitendra 9107e57383 Added image lazyloading in velocity theme 2020-10-13 19:52:51 +05:30
devansh bawari 9601000c67 Merge branch 'master' into guest_functionality_removal
Merged With Master
2020-10-13 17:09:29 +05:30
Jitendra Singh 2480219b08
Merge pull request #4073 from vishal-webkul/issue-4061
Issue #4061 Fixed
2020-10-13 15:44:39 +05:30
Jitendra Singh d0740a5f9d
Merge pull request #4066 from jaseelbavu/issue-3938
Added configuration to enable/disable image search feature
2020-10-13 15:43:41 +05:30
vishal.kushwaha650 f244eeec16 fix search exception issue 2020-10-13 14:40:45 +05:30
vishal.kushwaha650 1d43eb00a6 Issue #4035 Fixed 2020-10-13 11:29:38 +05:30
Jaseel P V f11d75324a Added seed data for image search enable/disable feature (default active) 2020-10-12 20:35:16 +05:30
vishal.kushwaha650 e571e427eb Issue #4061 Fixed 2020-10-12 19:10:15 +05:30
devansh bawari 2ba4d358c8 Merge branch 'master' into guest_functionality_removal
Merged With Master
2020-10-12 18:54:43 +05:30
Jitendra Singh b05863e669
Merge pull request #4071 from deepaksinghgusain227/fixed-search
Fixed Search bar issue #3917
2020-10-12 18:45:53 +05:30
gusaindeepak54 65d215ee16 add image_search varibale 2020-10-12 16:50:55 +05:30
devansh bawari 85f3710930 Recompiled 2020-10-12 16:17:45 +05:30
gusaindeepak54 0c76d3c474 Resolve Search Bar Issue 2020-10-12 16:16:51 +05:30
devansh bawari d61199fd3f Merge branch 'master' into guest_functionality_removal 2020-10-12 16:16:44 +05:30
Jitendra Singh 6d0c34e17d
Merge pull request #4070 from jitendra-webkul/master
Added partner id to payap smart button
2020-10-12 16:11:27 +05:30
jitendra 6618c3658a Added partner id to payap smart button 2020-10-12 16:10:51 +05:30
Jitendra Singh 5404f1d387
Merge pull request #4039 from vishal-webkul/issue-4033
Issue #4033 Fixed
2020-10-12 16:00:16 +05:30
vishal.kushwaha650 7421799c80 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-4033 2020-10-12 15:42:03 +05:30
Jitendra Singh 8f021ea86a
Merge pull request #4053 from vishal-webkul/issue-4035
Issue #4035 Fixed
2020-10-12 15:34:09 +05:30
vishal.kushwaha650 016d0a23fa Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-4033 2020-10-12 15:10:26 +05:30
Jitendra Singh e08d41ae0c
Merge pull request #4009 from JunaidJaved8461/JJ
Fixed #3974 (Validation Message Shown now)
2020-10-12 12:43:21 +05:30
JunaidJaved8461 80d5c4c5a0
check now please 2020-10-12 12:04:47 +05:00
devansh bawari 921aaefbc4 Some Self Reviewed 2020-10-12 12:30:37 +05:30
vishal.kushwaha650 8f04ff90fc Conflicts Resolved 2020-10-12 12:29:33 +05:30
vishal.kushwaha650 728173deb9 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-4035 2020-10-12 12:23:14 +05:30
devansh bawari a6b969ad97 Recompiled 2020-10-12 12:08:55 +05:30
devansh bawari 5f6da14d8f Merge branch 'master' into guest_functionality_removal 2020-10-12 12:07:58 +05:30
Jitendra Singh 6406573cfa
Merge pull request #4046 from g1dra/tax-rate-validation-message
Fixed validation message on entering non numeric data for tax_rate
2020-10-12 12:04:46 +05:30
devansh bawari 885efbcf8b Some Changes Added 2020-10-12 12:03:11 +05:30
Jitendra Singh f16935a56e
Merge pull request #4058 from jitendra-webkul/master
Improved lighthouse score for velocity theme
2020-10-12 12:00:40 +05:30
Jitendra Singh 2bbe3df5d1
Merge pull request #4060 from devansh-webkul/config_cache_issue
Config Cache Issue Fixed #4003
2020-10-12 11:54:38 +05:30
Jitendra Singh 01e985ac98
Merge pull request #4063 from jaseelbavu/master
Added missing compiled assets for image slider #3987
2020-10-12 11:53:57 +05:30
devansh bawari 9e52a78a51 Some Minor Bug Fixes 2020-10-12 11:35:43 +05:30
JunaidJaved8461 87ba9e970a
!!!Done!!! 2020-10-12 11:03:14 +05:00
devansh bawari be56b09b2f Default Functionality Removed 2020-10-12 11:14:50 +05:30
JunaidJaved8461 45cd9d7840
Defined Minor Changes Done!! 2020-10-12 10:29:50 +05:00
Jaseel P V bcfcdf0368 Added configuration to enable/disable image search feature 2020-10-10 19:45:51 +05:30
Darko 44ffada8a8 Merge remote-tracking branch 'upstream/master' 2020-10-10 14:55:14 +02:00
Darko 41438448a1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
#	packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
2020-10-10 14:47:43 +02:00
darko 64aa1ded11 Fixed validation message on entering non numeric data for tax_rate in create and edit tax view. 2020-10-10 14:46:53 +02:00