1076854608
Merge branch 'master' into shipping-zones
...
# Conflicts:
# assets/css/admin.css
# includes/abstracts/abstract-wc-shipping-method.php
# includes/class-wc-shipping.php
# includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
# includes/shipping/flat-rate/includes/class-wc-eval-math.php
# includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
bdb8de7785
Zone unit tests
2016-01-08 14:53:24 +00:00
accc62d5ef
Breadcrumb tweak
2016-01-08 12:10:40 +00:00
cef3ec7e37
Indicate disabled methods
2016-01-08 11:57:49 +00:00
007abbc98e
Shipping meta data
...
Closes #9094
2016-01-08 11:42:32 +00:00
ad11042afd
[2.4] Don't unforce SSL on secure blogs
...
@claudiosmweb can you check this and cherry pick if good to go?
Fixes #10029
2016-01-08 11:27:18 +00:00
45dd6890c7
Use selected instead of checked for currency code in setup wizard
2016-01-07 16:58:53 +05:45
ca69ed7012
Wizard integration
2016-01-06 14:21:13 +00:00
e4c45c0c47
Merge pull request #9964 from frozzare/docs/class-wc-admin-settings
...
Improve docblock comments in WC_Admin_Settings class
2016-01-05 14:01:34 -02:00
0fc96d3015
Merge pull request #9965 from frozzare/docs/class-wc-admin-meta-boxes
...
Improve docblock comments in WC_Admin_Meta_Boxes class
2016-01-05 14:00:26 -02:00
2cb64100a0
Merge pull request #9966 from frozzare/docs/class-wc-admin-menus
...
Improve docblock comments in WC_Admin_Menus class
2016-01-05 14:00:12 -02:00
84aa679980
Merge pull request #9967 from frozzare/docs/class-wc-admin-addons
...
Improve docblock comments in WC_Admin_Addons class
2016-01-05 14:00:07 -02:00
01908dca5d
Merge pull request #9968 from frozzare/docs/class-wc-settings
...
Improve docblock comments in WC_Settings_* classes
2016-01-05 13:59:56 -02:00
648b33fab9
Merge pull request #9969 from frozzare/docs/class-wc-admin-taxonomies
...
Improve docblock comments in WC_Admin_Taxonomies class
2016-01-05 13:59:48 -02:00
c7ab50ec7e
Add missing param tags to various wc admin docblocks
2016-01-05 16:49:41 +01:00
559d9259ea
Improve docblock comments in WC_Admin_Taxonomies class
...
* Added missing param tags
* Updated param types to right type
2016-01-05 16:42:03 +01:00
005be911b5
Improve docblock comments in WC_Admin_Settings class
...
* Added comments to properties that don’t have any.
2016-01-05 16:37:28 +01:00
7783ec5ca6
Improve docblock comments in WC_Admin_Meta_Boxes class
...
* Added comments to properties that don’t have any.
* Fixed can typo: `cna => can`
2016-01-05 16:32:16 +01:00
a64fa98b40
Improve docblock comments in WC_Admin_Menus class
...
* Added comment to `nav_menu_links` since it didn’t have any.
2016-01-05 16:29:16 +01:00
b4bcf38a26
Improve docblock comments in WC_Admin_Addons class
...
* Added missing param tags
2016-01-05 16:24:48 +01:00
72f062b452
Improve docblock comments in WC_Settings_* classes
...
* Added comments to properties that don’t have any.
2016-01-05 16:22:18 +01:00
ade2b04ab3
Merge pull request #9960 from frozzare/docs/class-wc-report-stock
...
Improve docblock comments in WC_Report_Stock class
2016-01-05 12:15:34 +00:00
12bf6c5355
Merge pull request #9959 from frozzare/docs/class-wc-report-sales-by-category
...
Improve docblock comments in WC_Report_Sales_By_Category class
2016-01-05 12:15:21 +00:00
a8f8802631
Merge pull request #9958 from frozzare/docs/class-wc-report-sales-by-date
...
Improve docblock comments in WC_Report_Sales_By_Date class
2016-01-05 12:14:01 +00:00
6ee8727ff6
Merge pull request #9957 from frozzare/docs/class-wc-report-sales-by-product
...
Improve docblock comments in WC_Report_Sales_By_Product class
2016-01-05 12:13:13 +00:00
cc1232e126
Merge pull request #9956 from frozzare/docs/class-wc-report-out-of-stock
...
Improve docblock comments in WC_Report_Out_Of_Stock class
2016-01-05 12:12:38 +00:00
c564a05ac3
Merge pull request #9954 from frozzare/docs/class-wc-report-customers
...
Improve docblock comments in WC_Report_Customers class
2016-01-05 12:12:18 +00:00
80eb99526d
Merge pull request #9955 from frozzare/docs/class-wc-report-most-stocked
...
Improve docblock comments in WC_Report_Most_Stocked class
2016-01-05 12:11:46 +00:00
67308a3131
Add missing `exit if accessed directly` to WC_Report_Taxes_* classes
2016-01-05 12:47:44 +01:00
a9b4cc2caf
Improve docblock comments in WC_Report_Stock class
...
* Added comments to properties that don’t have any.
* Added comment to `__construct`, `column_default`, `get_columns` and
`prepare_items` since it
was `method function`
* Added missing param tags to `display_tablenav`
2016-01-05 12:46:15 +01:00
53d5684c92
Improve docblock comments in WC_Report_Sales_By_Product class
...
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets` since it
was `method function`
* Added missing `exit if accessed directly`
* Updated `current_filters` and `products_widget`
2016-01-05 12:41:12 +01:00
0b62c624fa
Improve docblock comments in WC_Report_Sales_By_Date class
...
* Added comments to properties that don’t have any.
* Fixed return tag value for `get_report_data`
2016-01-05 12:28:49 +01:00
97d47fb576
Move zones to main settings
2016-01-05 11:23:15 +00:00
03a3e4f06d
Improve docblock comments in WC_Report_Sales_By_Category class
...
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets` since it
was `method function`
* Added missing `exit if accessed directly`
* Updated `category_widget` comment to a better one.
2016-01-05 12:18:58 +01:00
a59e110895
Improve docblock comments in WC_Report_Out_Of_Stock class
...
* Added missing param tags to `get_items`
2016-01-05 11:52:38 +01:00
c88119814c
Improve docblock comments in WC_Report_Most_Stocked class
...
* Added missing param tags to `get_items`
2016-01-05 11:37:33 +01:00
e07185ec1f
Merge pull request #9952 from frozzare/docs/class-wc-report-low-in-stock
...
Add missing docblock param tags to get_items in WC_Report_Low_In_Stock class
2016-01-05 10:17:13 +00:00
a24df3aa61
Merge pull request #9949 from frozzare/docs/class-wc-report-coupon-usage
...
Improve docblock comments in WC_Report_Coupon_Usage class
2016-01-05 10:17:03 +00:00
8231853f70
Merge pull request #9950 from frozzare/docs/class-wc-admin-report
...
Improve docblock comments in WC_Admin_Report class
2016-01-05 10:16:49 +00:00
b589d22a84
Improve docblock comments in WC_Report_Customers class
...
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets`, `customers_vs_guests` since it
was `method function`
* Added missing `exit if accessed directly`
* Updated `get_main_chart` comment since it is wrong.
2016-01-05 11:11:20 +01:00
c0be061de6
Add missing docblock param tags to WC_Report_Low_In_Stock class
2016-01-05 11:08:12 +01:00
130ff76ffc
Improve docblock comments in WC_Report_Customer_List class
...
* Added missing `public` before `column_default` function
* Added comment to `__construct `, `column_default`, `get_columns` and
`prepare_items` since it was `method function`
2016-01-05 10:00:52 +01:00
e0f5117efe
Improve docblock comments in WC_Report_Coupon_Usage class
...
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets` since it was `method function`
* Updated `coupons_widget` comment since it is wrong.
* Added missing `exit if accessed directly`
2016-01-05 09:54:43 +01:00
004ab615c5
Improve phpdoc comments in WC_Admin_Report class
...
* Added comments to properties that don’t have any.
* Fixed return value for `prepare_chart_data`.
* Added comment to `get_chart_widgets` since it was `method function`
2016-01-05 09:48:39 +01:00
9f5f1bd4fe
Merge pull request #9943 from frozzare/docs/admin-wc-meta-boxes
...
Add missing phpdoc param tags to all WC_Meta_Box_* classes
2016-01-04 20:01:50 -02:00
da2e0ac950
Add missing phpdoc param tags to all WC_Meta_Box_* classes
2016-01-04 22:31:36 +01:00
efb6c0d430
Merge pull request #9941 from frozzare/docs/admin-wc-tax-rate-importer
...
Improve phpdoc comments in WC_Tax_Rate_Importer class
2016-01-04 18:40:40 -02:00
ae42781027
extra escaping in search
2016-01-04 19:14:18 +00:00
e4e4428343
Speed up numeric order searches
...
Closes #9942
2016-01-04 18:58:14 +00:00
749a09c64a
Improve phpdoc comments in WC_Tax_Rate_Importer class
2016-01-04 17:07:23 +01:00
Mike Jolley
Shiva Poudel
Claudio Sanches
Fredrik Forsmo