Commit Graph

6824 Commits

Author SHA1 Message Date
devansh bawari 921aaefbc4 Some Self Reviewed 2020-10-12 12:30:37 +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
devansh bawari be56b09b2f Default Functionality Removed 2020-10-12 11:14:50 +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
Jaseel P V 5cf969e0f7 Added missing compiled assets for image slider 2020-10-09 22:29:09 +05:30
devansh bawari 724774c1bc Isue Fixed 2020-10-09 19:58:55 +05:30
jitendra 616c4692a1 Update 2020-10-09 19:13:04 +05:30
jitendra e7d7ee58b6 Resolved conflicts 2020-10-09 19:06:52 +05:30
jitendra 3cb0b87dbb Improved lighthouse score for velocity theme 2020-10-09 19:05:13 +05:30
Jitendra Singh 3d060d63d5
Merge pull request #4054 from devansh-webkul/url_decoding_issue
Decode Function Added #4049
2020-10-09 16:58:33 +05:30
Jitendra Singh b0ba7bf754
Merge pull request #3882 from devansh-webkul/variant_issue
Fixed #3874
2020-10-09 16:56:20 +05:30
devansh bawari cf1696f808 Decode Funtion Added 2020-10-09 16:48:45 +05:30
Jitendra Singh 850fed2678
Merge pull request #4052 from devansh-webkul/table_issue
Table Overflow Fixed #4020
2020-10-09 15:17:19 +05:30
devansh bawari dc17e4799d Some Self Reviewed 2020-10-09 15:07:34 +05:30
devansh bawari 813b48a77c Table Overflow Fixed 2020-10-09 14:45:49 +05:30
Jitendra Singh 178f74ec52
Merge pull request #4051 from vishal-webkul/issue-4045
Issue #4045 Fixed
2020-10-09 14:23:05 +05:30
vishal.kushwaha650 8cf7b2aaa6 Issue #4045 Fixed 2020-10-09 14:01:49 +05:30
Jitendra Singh 22df978053
Merge pull request #4050 from devansh-webkul/category_issue
Fixed category height overflow issue #4044
2020-10-09 14:01:35 +05:30
devansh bawari eeb437a5f8 PSR 2 Recomendation Followed 2020-10-09 13:48:51 +05:30
Jitendra Singh e99527d67f
Merge pull request #4040 from devansh-webkul/homepage_config_issue
Required Removed #4038
2020-10-09 13:45:47 +05:30
Jitendra Singh e6a113f604
Merge pull request #4041 from devansh-webkul/master
Continue Added #4037
2020-10-09 13:43:42 +05:30
devansh bawari 9fa1e1c9a8 One Change Reverted 2020-10-09 13:11:43 +05:30
devansh bawari 4edcdd4ba2 Overflow Auto Added 2020-10-09 13:08:52 +05:30
devansh bawari b3d7f4891e Seeder Added 2020-10-09 12:29:28 +05:30
darko f0ce58e0b4 Fixed validation message on entering non numeric data for tax_rate in create and edit tax view. 2020-10-08 23:23:31 +02:00
devansh bawari 6646473877 Continue Added 2020-10-08 19:43:21 +05:30
devansh bawari 0ee69a9adc Required Removed 2020-10-08 19:07:27 +05:30
devansh bawari 64c0c46496 Merge branch 'master' into variant_issue
Merged With Master
2020-10-08 17:28:28 +05:30
devansh bawari 06857d85a7 Pagination Fixed 2020-10-08 17:27:57 +05:30
Jitendra Singh 76f2ec6c8a
Merge pull request #4017 from vishal-webkul/issue3950
Issue 3950 Fixed
2020-10-08 15:39:20 +05:30
Jitendra Singh 0820b69536
Merge pull request #4026 from paymin/master
fix: showing success message on deleting
2020-10-08 14:36:55 +05:30
Jitendra Singh f2e074d20c
Merge pull request #4018 from asif-webkul/master
fixed issue #3983
2020-10-08 13:59:09 +05:30
Jitendra Singh e4d5b7021e
Merge pull request #4025 from jaseelbavu/master
Fixed issue in image slider path
2020-10-08 13:58:24 +05:30
Jitendra Singh cd29a97755
Merge pull request #4027 from jaseelbavu/issue-4023
Fixed filter issue in admin panel #4023
2020-10-08 13:20:51 +05:30
Jitendra Singh 565ae426ba
Merge pull request #4032 from vishal-webkul/issue-4030
Issue #4030 Fixed
2020-10-08 13:19:17 +05:30
Jitendra Singh 4aa84d6d0e
Merge pull request #4034 from vishal-webkul/issue-4031
Issue #4031 Fixed
2020-10-08 13:18:39 +05:30
vishal.kushwaha650 8399833225 Issue #4031 Fixed 2020-10-08 13:02:23 +05:30
Jaseel P V a2cbec7ad2 Fixed filter issue in admin panel 2020-10-08 12:53:17 +05:30
vishal.kushwaha650 6afb1ffa44 Issue #4030 Fixed 2020-10-08 12:48:09 +05:30
devansh bawari b8c2b4335e Merge branch 'master' into variant_issue
Merged With Master
2020-10-08 10:01:44 +05:30
devansh bawari 8eb590d526 List View Added 2020-10-08 10:00:06 +05:30