0a6e5f7d16
Merge branch 'master' of https://github.com/woocommerce/woocommerce
2018-06-04 20:13:45 +00:00
4daa28daee
woocommerce_shipping_calculator to support custom button text
2018-06-01 21:29:33 +01:00
45d6c55f2a
selected logic, with added sanitize_title
2018-05-29 14:32:20 +01:00
786641e976
Merge pull request #20232 from rnaby/250518-161500-wc-template-functions-wc_logout_url
...
wc_logout_url refactored
2018-05-25 11:40:00 +01:00
49f76ebb5b
wc_logout_url refactored
2018-05-25 16:34:06 +06:00
717fd61a16
Merge pull request #20226 from rnaby/250518-104427-wc-template-functions-get_product_search_form
...
Removed get_product_search_form else
2018-05-25 11:29:07 +01:00
416a4785b2
Merge pull request #20230 from rnaby/250518-154433-wc-template-functions-wc_get_rating_html
...
wc_get_rating_html refactored
2018-05-25 11:28:27 +01:00
fc24e2f440
Merge pull request #20214 from rnaby/240518-232027-wc-template-functions-woocommerce_pagination
...
woocommerce_pagination refactored
2018-05-25 11:23:36 +01:00
c3f4826caf
wc_get_rating_html refactored
2018-05-25 16:10:26 +06:00
52d28b69c2
Removed Else
2018-05-25 10:45:38 +06:00
4a8b7b876e
woocommerce_pagination refactored
2018-05-24 23:23:10 +06:00
18ae4c8d5c
wc_setup_product_data refactored
2018-05-24 23:11:13 +06:00
2f87873ca5
Merge pull request #20093 from rnaby/160518-090545
...
Little clean up and fix
2018-05-24 16:26:15 +01:00
83a9831dc0
Merge pull request #20092 from rnaby/160518-084433
...
wc_get_loop_class logic simplified
2018-05-24 16:25:26 +01:00
830e42794e
Add woocommerce_checkout_skip_update_order_review_expired and woocommerce_checkout_skip_cart_is_empty_check filter calls.
2018-05-23 20:40:23 +00:00
5afb40fcbb
Merge pull request #20162 from woocommerce/fix/20133-string-parsing
...
Improve external product string parsing
2018-05-22 13:54:03 +01:00
a3c18696e8
Fix terms display in preview
2018-05-22 11:19:39 +01:00
7609ed82da
Make wc_query_string_form_fields handle strings
2018-05-22 10:53:08 +01:00
0c70ed69f3
Little clean up and fix
2018-05-16 09:08:49 +06:00
3f824ae000
wc_get_loop_class logic simplified
2018-05-16 08:47:35 +06:00
6ab75247f7
Check that the terms condtions page actually exists and not just for an saved ID.
2018-05-07 11:05:38 +02:00
2f8f30cd29
Make some strings easier to translate for translators
2018-05-03 14:50:39 +01:00
8e0f0cbc29
Lazy load children and attributes for variable products
2018-05-01 11:57:00 +01:00
ccff8ecd17
Fix policy text preview in customizer.
2018-04-26 12:11:11 +01:00
fe30b4900e
Merge pull request #19798 from tivnet/patch-6
...
Update wc-template-functions.php
2018-04-20 11:37:39 +01:00
88b9f3763e
Update wc-template-functions.php
...
`wc_privacy_policy_page_id()` has no parameters.
2018-04-19 21:35:02 -04:00
02a4538c82
Update wc-template-functions.php
...
Spelling
2018-04-19 21:19:36 -04:00
8aa214bab5
Better callback
2018-04-19 18:37:07 +01:00
48eb13d602
Merge pull request #19747 from woocommerce/update/19734
...
Add privacy policy to account pages
2018-04-18 07:26:06 -07:00
97e747e745
Add default text prop
2018-04-18 11:05:36 +01:00
6c5d4c7cda
Add privacy settings
2018-04-17 18:32:31 +01:00
c185d6b6d3
Merge branch 'fix/19620' of github.com:woocommerce/woocommerce into fix/19620
2018-04-17 12:54:35 -03:00
a7ce4ff6d3
Escape all at the same time
2018-04-17 12:54:01 -03:00
933bcc32c3
Merge branch 'master' into fix/19620
2018-04-17 12:45:20 -03:00
f18220a009
Updated unit tests
2018-04-17 12:31:14 -03:00
54b6174b34
Fixed $post when using product instance
2018-04-17 12:21:56 -03:00
c19836b0e4
Moved espace to wc_product_class
2018-04-17 12:18:21 -03:00
627292d627
Include categories and tags by default
2018-04-17 12:14:18 -03:00
8a19c5962b
Further simplified customiser options
2018-04-16 17:56:44 +01:00
6c14ad9a88
More wording tweaks
2018-04-11 17:12:48 +01:00
592605f071
Wording
2018-04-11 16:45:41 +01:00
cdd5b25bd8
Privacy page and default text handling
2018-04-11 16:41:39 +01:00
60ad91266d
Fixed wrong variable
2018-04-06 15:08:11 -03:00
b3bf245929
Introduced new wc_get_product_class() and wc_product_class functions
2018-04-06 13:58:59 -03:00
212a8a180f
Back compat
2018-04-06 11:51:03 +01:00
3140a0fb62
More customistion options for terms and conditions.
2018-04-06 11:43:30 +01:00
3bf567279b
Improve default appearance of descriptions so they toggle on focus and support HTML.
2018-04-05 16:56:00 +01:00
3a6c3e002b
Add option to choose if the checkout marks either required or optional fields, and style these options.
2018-04-05 14:12:59 +01:00
80dc183880
Use nbsp to separate * denoting required fields.
2018-04-04 16:45:40 +02:00
c2e27919ce
Replaced array_key_exists with isset test
2018-03-28 11:19:03 +02:00
86f1b3701f
Tag stripped outside template
...
Stripping only affects aria-label attribute now.
2018-03-27 17:19:49 +02:00
0660a50e07
Removed obvious boolean results
2018-03-21 19:57:10 -03:00
15989622df
Fixed PHP warning on woocommerce_catalog_ordering()
...
This fixes the follow warning:
> PHP Warning: array_key_exists(): The first argument should be either a string or an integer in includes/wc-template-functions.php on line 1012
When an option doesn't exists is returned `false`, just setting a default value to fix the issue.
This issue should happen in new installations of WooCommerce 3.3 when no
order is defined on the customizer.
2018-03-16 15:13:21 -03:00
6cc5f2e171
Merge pull request #19140 from woocommerce/fix/subcategory-cache
...
Clear subcategory cache
2018-03-16 14:08:58 +00:00
d052b2ee46
cache per parent to avoid large caches
2018-03-13 19:00:08 +00:00
c38e0e69e9
Merge pull request #19376 from woocommerce/fix/19362
...
Correctly handle default ordering on the search page
2018-03-13 10:39:59 -07:00
1dbf1bc1d8
add general woocommerce_form_field filter
2018-03-13 14:30:19 +00:00
e4e581c2ef
Correctly handle default ordering on the search page
...
Fixes woocommerce_catalog_ordering function and closes #19362 .
2018-03-13 10:43:58 +00:00
48303278f6
Merge pull request #19373 from nishitlangaliya/issue-19323
...
missing single quote added
2018-03-13 09:59:55 +00:00
4b4fd3931e
missing single quote added
2018-03-13 11:15:43 +05:30
4fbd01f003
Merge pull request #19288 from woocommerce/fix/19210
...
Introduce woocommerce_product_loop helper for loops
2018-03-12 10:50:25 -07:00
8fa7a7695a
Add Filter to woocommerce_output_product_categories
2018-03-12 16:09:00 +05:30
6d76cb71fd
Introduce woocommerce_product_loop helper
2018-03-07 12:54:00 +00:00
b34e163bd5
No js for all the themes.
2018-03-07 11:44:41 +00:00
4bce7b0223
Use single cache for hierarchy
2018-02-28 18:24:03 +00:00
c8642f0da7
PHPCS fixes
2018-02-23 10:16:22 +02:00
c13dee6fb3
Add page 1 to check when displaying shop page content.
2018-02-23 10:14:59 +02:00
3353d80ecd
wc_get_loop_class; force columns to be a minimum of 1
2018-02-22 15:44:28 +00:00
380ee9a13f
Merge pull request #18536 from woocommerce/update/17908
...
Refactor woocommerce_wp_select so it could be used for a multiselect
2018-02-22 12:19:11 +00:00
03a1906706
Post image is enough
2018-02-21 17:21:02 +00:00
8d1408fa04
Add WP classes to image gallery
2018-02-21 17:21:02 +00:00
280ca3757e
wc_get_gallery_image_html checks
2018-02-13 19:18:13 +00:00
2b36b5f49f
Main image should be larger.
2018-02-13 11:16:42 +00:00
ebb246d9d3
wc_get_gallery_image_html helper function
2018-02-13 11:16:42 +00:00
830a2cb5a5
Don't prepend cats for regular shortcodes
2018-02-08 17:37:56 +00:00
974ff71129
Merge pull request #18747 from woocommerce/fix/woocommerce_content
...
Was missing wc_get_loop_prop check like the main archive
2018-02-01 14:34:25 +00:00
add3ca3bea
This removes pagination and products from display for themes not using wc_get_loop_prop in their product loops.
2018-02-01 14:31:00 +00:00
00d16dce0e
Was missing wc_get_loop_prop check like the main archive
2018-02-01 13:22:50 +00:00
fc3bf3edf2
Moved this below query to prevent subcategories display mode also showing products.
2018-01-31 21:24:14 +00:00
cbaa8831d5
Merge master and resolve conflicts
2018-01-31 11:24:21 -08:00
e6f54912ee
Merge branch 'master' into fix/18680
2018-01-31 17:56:46 +00:00
1f2046a3e3
Revert columns to 4
2018-01-31 17:55:17 +00:00
586619b136
merge the loop, don't bail
2018-01-31 16:44:50 +00:00
40c59d31f2
Merge branch 'master' into fix/18674
2018-01-31 16:29:08 +00:00
c28e2e2de5
Merge pull request #18706 from woocommerce/update/uncategorized
...
Uncategorized tweaks
2018-01-31 08:16:51 -08:00
a8cc6c8871
Remove deprecation notice
2018-01-31 15:46:47 +00:00
5a4cc2d46c
Update comment.
2018-01-31 15:35:25 +00:00
b8df0ea474
Hide uncategorized from store by default.
2018-01-31 13:37:23 +00:00
0f33d446e3
Before getting wc_get_loop_prop, setup the loop.
...
Closes #18687
2018-01-31 11:59:40 +00:00
96982cd318
Min columns must be 1, not 0
2018-01-30 23:32:52 +00:00
81c8aba8c9
Add woocommerce_output_product_categories so we can handle legacy templates.
2018-01-30 23:24:26 +00:00
538ee2097c
Merge pull request #18594 from alexminza/master
...
Added support for additional HTML5 input types for settings/checkout forms
2018-01-30 17:33:13 -02:00
057b40e044
Remove kses from before/after attribute
...
Closes #18643
2018-01-30 11:45:00 +00:00
519bfadc63
Added support for additional HTML5 input types
2018-01-25 15:14:30 +02:00
70e92302f5
Refactor woocommerce_wp_select so it could be used for a multiselect
2018-01-19 13:36:14 +00:00
371f504964
Helpers for theme support vars and error messages.
2018-01-08 18:48:57 +00:00
ece1963e66
Fix default columns isset check.
2018-01-02 19:27:28 +00:00
0192fb9ef0
Add woocommerce_loop_product_link filter
2017-12-25 02:20:40 -06:00
755647ec5c
Improve subcat display to see if subcats can actually be displayed
2017-12-13 15:46:09 +00:00
f4927ea837
Give control over loop button attributes
...
Closes #18079
2017-12-11 13:09:21 +00:00
5b0df590c0
Merge pull request #18065 from woocommerce/improve/18064
...
Add default row/column control for themes
2017-12-08 16:14:19 +00:00
fef9d612c7
Better function name
2017-12-08 07:38:40 -08:00
b2cac1dcab
Better description
2017-12-08 07:36:33 -08:00
e37391affb
Set/remove defaults on theme activation
2017-12-08 07:33:42 -08:00
600b1bd82c
Revert "Add defaults control for themes"
...
This reverts commit 29090e4676
2017-12-08 07:23:46 -08:00
e22318449e
Fix syntax error @bor0
2017-12-07 14:29:07 -08:00
29090e4676
Add defaults control for themes
2017-12-07 11:35:06 -08:00
d0f9aaa99a
Merge branch 'master' into tweak/decouple-cart-template-methods
2017-12-07 20:16:08 +01:00
588c5f3779
Change method name
2017-12-07 15:53:16 +01:00
1f2011e8de
Tweak query args
2017-12-06 19:03:14 +00:00
3c36ab0517
Helper functions for loop handling to avoid global usage, and helper for displaying subcats
2017-12-06 18:10:19 +00:00
8dcffa660e
Normalise get_query_results names and add new param for pagination
2017-12-06 13:13:43 +00:00
535d014ef9
Line up arrays
2017-12-05 10:50:17 -08:00
aab65923c1
Refactor for better style
2017-12-05 10:45:08 -08:00
fec60ab2ea
Fix product shortcode pagination
2017-12-05 08:31:50 -08:00
145d47c580
Decouple cart templating methods from WC_Cart class
2017-12-05 13:00:21 +01:00
d60456cc73
Resolve conflicts and bring up to date with master
2017-12-04 13:56:59 -08:00
20633d409d
Fix archive with default permalinks
2017-12-04 15:35:52 +00:00
b1bef237d1
made function : woocommerce_template_loop_product_link_open, woocommerce_template_loop_product_link_close, woocommerce_template_loop_category_link_open, woocommerce_template_loop_category_link_close pluggable
2017-12-01 14:58:42 +05:30
d438a68300
Allow woocommerce_form_field() have 'custom_attributes' equal 0
...
array_filter() by default will remove all null values, also 0 or false,
but if trying to declare something like array( 'min' => '0', 'max' =>
'10' ) this will be a problem. So including added strlen() as callback
function will allow keep some strings but still remove null and false
values.
Ref #17940
2017-11-29 18:45:44 -02:00
216ddc799a
Fixed VSCode auto align mistake
...
One more reason to go back to sublime
2017-11-21 10:53:15 -02:00
9681a331e9
Fixed coding standards
2017-11-20 20:19:09 -02:00
5a858eb2b1
Use WC_Query->get_query_vars() instead of WC_Query->query_vars
...
Closes #17733
2017-11-20 14:40:56 -02:00
46775c2f7d
standards
2017-11-20 12:14:05 +00:00
0018b4349e
Fix: Apostrophe wrongly escaped for price nav filter and widget nav filters
2017-11-18 20:11:53 +01:00
9e79ceff08
Merge branch 'master' into feature/unsupported-theme
2017-11-14 17:03:35 +00:00
5adb1edef5
Since options are hidden, remove notices for now - allow use.
2017-11-10 16:26:33 +00:00
d765e2319c
Added theme support vars for grid settings
...
- product_grid
- min_rows
- max_rows
- min_columns
- max_columns
If settings violate these, they will be updated.
If loop_shop_columns is defined, settings are hidden with a notice.
2017-11-09 18:11:35 +00:00
2a3ace9853
Merge branch 'master' into feature/17550-archives-template-support
2017-11-09 17:34:57 +00:00
33995ace01
Helper functions
2017-11-09 17:34:54 +00:00
0d09d0c0fd
Grab description directly to pass through wc_format_content
2017-11-09 16:57:50 +00:00
6e08ff0284
Merge pull request #17610 from woocommerce/update/17557
...
Theme support to declare image sizes
2017-11-09 16:04:22 +00:00
23aa0277d2
Rows and cols
2017-11-09 12:37:14 +00:00
52c4d21d18
Term logic fix
2017-11-09 12:09:11 +00:00
ddb357cc48
Missing var
2017-11-09 10:30:27 +00:00
c058921c9c
Optimisation of product subcats template functions
2017-11-08 20:00:23 +00:00
a0e2e59f9b
Orderby support
2017-11-08 18:09:39 +00:00
8da485e911
Allow reuse of pagination template file
2017-11-08 16:39:28 +00:00
9f6f5f9f17
Merge pull request #17609 from woocommerce/update/17254-input-to-button
...
Convert input submit elements to button submit elements
2017-11-07 19:21:04 +00:00
db4e630600
Replace thumbnail names
2017-11-07 18:48:51 +00:00
e025caf177
Widths and aspect ratios
2017-11-07 18:32:43 +00:00
6b514aaab8
Make underscores the default
2017-11-07 08:45:05 -08:00
e0a55cb8dd
input to button for submit in wc-template-functions.php
2017-11-07 10:40:28 +02:00
2171ae7c0a
PHPCS fixes for wc-template-functions.php
2017-11-07 10:39:10 +02:00
c3689134d0
Underscores wrappers
2017-11-06 13:46:50 -08:00
d0c1f16f26
Merge pull request #17533 from woocommerce/fix/17509
...
Remove kses from term description
2017-11-02 10:47:57 -07:00
92a8bdf616
Remove kses from term description
...
Closes #17509
2017-11-02 17:13:02 +00:00
eb1bcee8b9
For code doing it wrong, ensure priority is set
2017-11-02 11:13:24 +00:00
9e29ed0bda
Removed wp_kses_post() from product archive description
...
Fixes #17492
2017-11-01 14:16:19 -02:00
d23448a823
Merge branch 'master' into fix/17300-search-orderby
2017-10-25 20:53:25 -02:00
7ab0b25ba5
Only set to relevance when the orderby is set to menu_order
2017-10-20 10:33:21 -07:00
5d9efb7885
Set orderby to relevance when searching for products. Closes #17300
2017-10-20 10:28:23 -07:00
f9cff6e3f8
PHPCS Fixes. @claudiosanches Would you mind reviewing these as it is quite a lot of changes.
2017-10-20 10:24:56 -07:00
4844abc326
add woocommerce_cross_sells_order
...
Filter to control sort direction.
2017-10-20 09:11:00 -07:00
a6059ea759
Remove menu-ordering sorting
2017-10-11 21:36:13 +01:00
d72f6ae22c
Ensure query_vars is set. Closes #17044
2017-10-04 15:37:43 +01:00
fb8bac5957
make hidden country/state readonly
...
make hidden country / state fields read only. fixes #17026
2017-10-02 15:24:37 -04:00
3a17d48af2
Added screen reader text to quantity input template
...
Closes #16909
2017-09-26 12:05:09 +01:00
220b37d5f2
Show sorting on search results but default to relevance
...
Closes #16565
2017-08-24 12:58:50 +01:00
909c3f6c8f
Fixed extra "!" and ")" on #16489
2017-08-17 19:05:46 -03:00
d4a02819a7
Add filter to woocommerce_order_again_button to match WC_Form_Handler->order_again
...
This commit adds the `woocommerce_valid_order_statuses_for_order_again` filter to the conditional check
before displaying the order-again button.
The purpose is to enable consistency when altering the valid order again statuses - in the past a dev would
need to use this filter to let the order through the form handler, and then override the template file for a really
trivial reason just to get the button to display.
2017-08-17 11:31:06 +09:30
7c01201e34
Add custom attributes into radio fields for woocommerce_form_field
2017-07-21 14:23:21 +01:00
d7484336c1
Fixed wrong class reference in comment
2017-07-20 13:29:54 +02:00
3522857d23
Fix typo in WooCommerce plugin ( #16135 )
...
* Fixed typo
* Fixed more typo
* Fixed more typo
* Fix tyop
* Fix more typo
* Fix more typo
* Fix typo
* Fix typo
* Fix typo
* Fix typo datatime object
* Fix short name of compat
* Fix typo: update short name
* Fix typo "deactive" to "deactivate" and short BW - Compat
* Fix typo "Backwards compat"
* Fix typo 'parameters'
* Fix more typo 'pararmeters'
* Fix typo 'compund'
* FIx typo order
* Fix typo
* Fix typo 'incorrecly'
* Fix typo 'genarate'
* Fix typo 'reletive'
* Fix typo 'Handly'
* Fix typo 'rotatated'
* Fix typo
* Fix typo 'additonal'
* Fix typos
2017-07-17 11:10:52 +01:00
fdcf16bb60
Merge branch 'master' into update/15563
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/helper-rtl.css
# assets/css/helper.css
# assets/css/wc-setup-rtl.css
# assets/css/wc-setup.css
# assets/css/woocommerce-rtl.css
# assets/css/woocommerce.css
2017-07-12 16:18:13 +01:00
572cf3813f
Spacing/typo fix
...
Should really combine all three of these filters into one as well.
2017-07-11 13:37:43 -05:00
3939f50ced
Download display in account/checkout
2017-07-11 13:45:35 +01:00
d0489206a7
minor typo fix
2017-07-06 17:24:28 +05:30
506c01f56a
Fix codesniffer violations
2017-06-27 14:19:59 -07:00
5bc03b41cf
Redirect ?customer-logout=true to the correct endpoint
...
Checking also for `'true' === $wp->query_vars['customer-logout']` to avoid infite loops when permalinks are deactivated and "My account" is the front page.
Closes #15789
2017-06-27 14:10:20 -03:00
dbe9705e4b
Disable search engines indexing core, dynamic, cart/checkout pages.
2017-06-21 12:52:52 +01:00
98684233dc
Filter visible children when outputting grouped products
2017-06-20 15:01:14 +01:00
ccad987bac
Allow state field to have the correct country set by passing it through
...
Fixes #15632
2017-06-16 11:45:53 +01:00
0b14e91a60
Merge pull request #15533 from woocommerce/fix/order-item-meta-formatting
...
Removes the use of strip_tags() when outputting order item meta
2017-06-13 11:35:03 +01:00
636ad8b652
Add a nonce and confirmation for logging out via the customer my account page
2017-06-12 14:02:29 +01:00
e644bccbe8
Removes the use of strip_tags() when outputting order item meta, to account for basic HTML tags, hyperlinks, etc.
2017-06-09 11:00:23 +02:00
5ee38c54c2
Option to disable reviews globally
2017-06-08 15:26:30 +01:00
41e8b22b5a
Merge branch 'pr/15219'
2017-05-23 19:28:45 +01:00
002dd935b5
Check we have a product object
2017-05-23 19:28:35 +01:00
c16acc6b51
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# assets/css/wc-setup-rtl.css
# assets/css/wc-setup.css
2017-05-23 19:00:24 +01:00
d3666738d8
Merge branch 'pr/15069'
2017-05-23 18:56:58 +01:00
00e5189a05
Merge pull request #15070 from rasmusbe/phpdoc-missing-return-throws
...
Phpdoc: Add missing return and throws
2017-05-23 18:50:58 +01:00
8f27df6af3
Merge pull request #14294 from woocommerce/fix/14292
...
When searching, disable WC sort order
2017-05-23 16:43:24 +01:00
90c987af70
Utilise $product method to get thumbnail
...
Is there any reason this function isn't using the `get_image()` method? It seems if we're accessing the `$post->ID`, then we should have access to the `$product` object too?
The reason being, the `get_image()` method also checks for the parent featured image, so is more robust. It may also be worth considering a filter in the `get_image()` method.
2017-05-22 22:07:51 +01:00
185934fad9
Fix phpdoc to include params and correct types
2017-05-15 13:50:52 +02:00
4f00d7e5e3
PHPDoc: Add missing return statement
2017-05-15 13:37:59 +02:00
af949b73ec
Add noscript style for gallery
...
Fixes #14882
2017-05-08 14:35:23 +01:00
c0e71a2238
Merge pull request #14797 from woocommerce/fix/14426-1
...
Standardize rating HTML in all templates
2017-05-05 17:47:28 -03:00
95f2033f88
Merge pull request #14895 from franticpsyx/tweak-wc-display-item-meta
...
[3.0] Tweak meta display value rendering in `wc_display_item_meta`
2017-05-05 17:09:03 -03:00
bbf0be1205
Tweak meta display value rendering in wc_display_item_meta
2017-05-05 16:11:49 +03:00
1753406dc0
Fixed warning when no customer country is defined.
...
Fixes #14850
2017-05-04 18:54:44 -03:00
ed5877f395
Improve docblocks
2017-05-02 16:48:00 -03:00
ad09564ff3
Removed extra comment
2017-04-28 20:08:37 -03:00
1d65c9d8b7
Better screen reader support
2017-04-28 19:59:50 -03:00
5826a9bce0
Display total of customer reviews and applied to rating template
2017-04-28 19:56:05 -03:00
685b999357
Fixed missing variable
2017-04-28 19:41:11 -03:00
d62e68fdb5
Better i18n support
2017-04-28 19:36:43 -03:00
a049835c05
Introduced new wc_get_star_rating_html() function
2017-04-28 19:32:25 -03:00
aacb01d1e7
Merge branch 'pr/13503'
...
# Conflicts:
# assets/css/twenty-seventeen.css
# assets/css/woocommerce-layout.css
# assets/css/woocommerce-layout.scss
# assets/css/woocommerce.css
2017-04-27 12:46:05 +01:00
29feafb116
Merge branch 'pr/14414'
2017-04-27 12:01:45 +01:00
therealgilles
Mike Jolley
Khan M Rashedun-Naby
Gerhard Potgieter
Gregory Karpinsky
Claudiu Lodromanean
Claudio Sanches
Peter Fabian
nishitlangaliya
Rodrigo Primo
Alexander Minza
Tiago Noronha
Caleb Burks
Boro Sitnikovski
Ibrahim Ibn Dawood
Alexandre GASNE
Lane Goldberg
Alex James Bishop
Paul Robinson
Adrian Mörchen
Jaydeep Rami
Farook Ibrahim
Matt Cohen
James Kemp
Rasmus Bengtsson
Manos Psychogyiopoulos