Skip to content

Commit

Permalink
Merge branch 'release/3.11.3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
shohag121 committed Jun 10, 2024
2 parents 3508b85 + 9a6c78c commit d2a44e3
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 38 deletions.
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Dokan - Best WooCommerce Multivendor Marketplace Solution - Build Your Own Amazon, eBay, Etsy #
# Dokan - Powerful WooCommerce Multivendor Marketplace Solution - Build Your Own Amazon, eBay, Etsy #
**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988/), [wedevs](https://profiles.wordpress.org/wedevs/), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu/)
**Donate Link:** http://tareq.co/donate/
**Tags:** WooCommerce multivendor marketplace, multivendor marketplace, multivendor, multi seller, multi vendor, WooCommerce marketplace, WooCommerce product vendors
**Requires at least:** 6.4
**Tested up to:** 6.5.3
**Tested up to:** 6.5.4
**WC requires at least:** 8.0.0
**WC tested up to:** 8.9.1
**WC tested up to:** 8.9.2
**Requires PHP:** 7.4
**Stable tag:** 3.11.2
**Stable tag:** 3.11.3
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Transform your WooCommerce site into a robust multivendor marketplace with Dokan - the #1 WooCommerce multivendor marketplace solution!
Transform your WooCommerce site into a multivendor marketplace with Dokan - a powerful and advanced WooCommerce multivendor marketplace solution

## Description ##

Expand Down Expand Up @@ -347,6 +347,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

### v3.11.3 ( Jun 10, 2024 ) ###

- **fix:** Responsive issue on vendor dashboard tabs preview.

### v3.11.2 ( May 27, 2024 ) ###

- **update:** WooCommerce 8.9.1 Compatibility added.
Expand Down
19 changes: 19 additions & 0 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ ul.dokan_tabs {
border-bottom: 1px solid #EDEDED;
margin-bottom: 20px;
line-height: 24px;
margin-left: 0;
}
ul.dokan_tabs > li {
margin-bottom: -1px !important;
Expand Down Expand Up @@ -2367,6 +2368,7 @@ div.media-sidebar a.edit-attachment {
margin: 0 0 10px 0;
border-bottom: 1px solid #EDEDED;
padding: 0 0 10px 0;
line-height: 1.25;
}
.dokan-dashboard header.dokan-dashboard-header .dokan-add-product-link .dokan-btn {
margin-right: 10px;
Expand Down Expand Up @@ -6373,6 +6375,23 @@ p.vendor-customer-registration .radio:hover {
float: none;
width: 100%;
}
.dokan-dashboard .dokan-dash-sidebar ul.dokan_tabs,
.dokan-dashboard .dokan-dashboard-content ul.dokan_tabs {
border: 0;
gap: 0.5rem;
display: flex;
flex-wrap: wrap;
align-items: flex-start;
}
.dokan-dashboard .dokan-dash-sidebar ul.dokan_tabs li,
.dokan-dashboard .dokan-dashboard-content ul.dokan_tabs li {
margin: auto 0 !important;
border-bottom: 1px solid #EDEDED;
}
.dokan-dashboard .dokan-dash-sidebar ul.dokan_tabs li.active a,
.dokan-dashboard .dokan-dashboard-content ul.dokan_tabs li.active a {
border-bottom: 1px solid #EDEDED;
}
.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-side-left,
.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-side-right {
float: none;
Expand Down
6 changes: 3 additions & 3 deletions dokan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* Plugin Name: Dokan
* Plugin URI: https://dokan.co/wordpress/
* Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
* Version: 3.11.2
* Version: 3.11.3
* Author: weDevs
* Author URI: https://dokan.co/
* Text Domain: dokan-lite
* Requires Plugins: woocommerce
* WC requires at least: 8.0.0
* WC tested up to: 8.9.1
* WC tested up to: 8.9.2
* Domain Path: /languages/
* License: GPL2
*/
Expand Down Expand Up @@ -66,7 +66,7 @@ final class WeDevs_Dokan {
*
* @var string
*/
public $version = '3.11.2';
public $version = '3.11.3';

/**
* Instance of self
Expand Down
28 changes: 14 additions & 14 deletions languages/dokan-lite.pot
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Copyright (c) 2024 weDevs Pte. Ltd. All Rights Reserved.
msgid ""
msgstr ""
"Project-Id-Version: Dokan 3.11.2\n"
"Project-Id-Version: Dokan 3.11.3\n"
"Report-Msgid-Bugs-To: https://dokan.co/contact/\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2024-05-27T10:12:19+00:00\n"
"POT-Creation-Date: 2024-06-07T09:14:47+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.9.0\n"
"X-Domain: dokan-lite\n"
Expand Down Expand Up @@ -1606,7 +1606,7 @@ msgstr ""
#: templates/orders/listing.php:83
#: templates/products/products-listing-row.php:67
#: templates/products/products-listing.php:121
#: templates/sub-orders.php:45
#: templates/sub-orders.php:47
#: templates/withdraw/pending-request-listing-dashboard.php:25
#: templates/withdraw/pending-request-listing.php:20
#: templates/withdraw/pending-request-listing.php:64
Expand All @@ -1631,7 +1631,7 @@ msgstr ""
#: templates/products/products-listing-row.php:125
#: templates/products/products-listing.php:130
#: templates/reverse-withdrawal/transaction-listing.php:19
#: templates/sub-orders.php:44
#: templates/sub-orders.php:46
#: templates/withdraw/approved-request-listing.php:20
#: templates/withdraw/cancelled-request-listing.php:20
#: templates/withdraw/pending-request-listing-dashboard.php:21
Expand Down Expand Up @@ -1930,7 +1930,7 @@ msgstr ""
#: includes/Assets.php:746
#: templates/orders/listing.php:20
#: templates/products/products-listing.php:108
#: templates/store-lists-filter.php:87
#: templates/store-lists-filter.php:84
#: assets/js/vue-admin.js:2
msgid "Apply"
msgstr ""
Expand Down Expand Up @@ -2030,7 +2030,7 @@ msgstr ""
#: templates/products/new-product.php:232
#: templates/products/tmpl-add-product-popup.php:68
#: templates/settings/bank-payment-method-settings.php:203
#: templates/store-lists-filter.php:86
#: templates/store-lists-filter.php:83
#: templates/withdraw/pending-request-listing-dashboard.php:24
#: templates/withdraw/pending-request-listing-dashboard.php:46
#: templates/withdraw/pending-request-listing.php:19
Expand Down Expand Up @@ -3751,7 +3751,7 @@ msgstr ""
#: templates/orders/details.php:19
#: templates/orders/listing.php:30
#: templates/orders/listing.php:57
#: templates/sub-orders.php:43
#: templates/sub-orders.php:45
#: assets/js/vue-admin.js:2
msgid "Order"
msgstr ""
Expand Down Expand Up @@ -4509,7 +4509,7 @@ msgstr ""
#: includes/Product/functions.php:510
#: templates/my-orders.php:101
#: templates/orders/listing.php:150
#: templates/sub-orders.php:96
#: templates/sub-orders.php:99
msgid "View"
msgstr ""

Expand Down Expand Up @@ -4696,7 +4696,7 @@ msgstr ""
#: templates/dashboard/products-widget.php:32
#: templates/my-orders.php:28
#: templates/orders/order-fee-html.php:24
#: templates/sub-orders.php:49
#: templates/sub-orders.php:51
msgid "Total"
msgstr ""

Expand Down Expand Up @@ -8551,7 +8551,7 @@ msgstr ""
#. translators: 1) order total amount 2) item count
#. translators: 1) order total amount 2) order item count
#: templates/my-orders.php:63
#: templates/sub-orders.php:85
#: templates/sub-orders.php:88
msgid "%1$s for %2$s item"
msgid_plural "%1$s for %2$s items"
msgstr[0] ""
Expand Down Expand Up @@ -8750,7 +8750,7 @@ msgid "Customer"
msgstr ""

#: templates/orders/listing.php:37
#: templates/sub-orders.php:47
#: templates/sub-orders.php:49
msgid "Shipment"
msgstr ""

Expand Down Expand Up @@ -8785,7 +8785,7 @@ msgid "%s ago"
msgstr ""

#: templates/orders/listing.php:116
#: templates/sub-orders.php:76
#: templates/sub-orders.php:79
msgid "Shipping Status"
msgstr ""

Expand Down Expand Up @@ -9484,7 +9484,7 @@ msgstr[1] ""
msgid "Sort by"
msgstr ""

#: templates/store-lists-filter.php:77
#: templates/store-lists-filter.php:74
#: assets/js/vue-admin.js:2
msgid "Search Vendors"
msgstr ""
Expand Down Expand Up @@ -9531,7 +9531,7 @@ msgstr ""
msgid "Sub Orders"
msgstr ""

#: templates/sub-orders.php:33
#: templates/sub-orders.php:34
msgid "This order has products from multiple vendors. So we divided this order into multiple vendor orders. Each order will be handled by their respective vendor independently."
msgstr ""

Expand Down
17 changes: 5 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dokan",
"version": "3.11.2",
"version": "3.11.3",
"description": "A WordPress marketplace plugin",
"author": "weDevs",
"license": "GPL",
Expand Down
10 changes: 7 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Contributors: tareq1988, wedevs, nizamuddinbabu
Donate Link: http://tareq.co/donate/
Tags: WooCommerce multivendor marketplace, multivendor marketplace, multivendor, multi seller, multi vendor, WooCommerce marketplace, WooCommerce product vendors
Requires at least: 6.4
Tested up to: 6.5.3
Tested up to: 6.5.4
WC requires at least: 8.0.0
WC tested up to: 8.9.1
WC tested up to: 8.9.2
Requires PHP: 7.4
Stable tag: 3.11.2
Stable tag: 3.11.3
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -347,6 +347,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A

== Changelog ==

= v3.11.3 ( Jun 10, 2024 ) =

- **fix:** Responsive issue on vendor dashboard tabs preview.

= v3.11.2 ( May 27, 2024 ) =

- **update:** WooCommerce 8.9.1 Compatibility added.
Expand Down
12 changes: 12 additions & 0 deletions templates/whats-new.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
* When you are adding new version please follow this sequence for changes: New Feature, New, Improvement, Fix...
*/
$changelog = [
[
'version' => 'Version 3.11.3',
'released' => '2024-06-10',
'changes' => [
'Fix' => [
[
'title' => 'Responsive issue on vendor dashboard tabs preview.',
'description' => '',
],
],
],
],
[
'version' => 'Version 3.11.2',
'released' => '2024-05-27',
Expand Down

0 comments on commit d2a44e3

Please sign in to comment.