WC order status conflicting with WP post_status (only with 'pending' post_status)
Merge branch 'master' of https://github.com/woothemes/woocommerce
Small grammar edit to template notice
filter for adding info before order item itemmeta in order metabox
loushou
filter to allow custom 'add line' buttons
loushou
filters for custom order item information on oi display tables
loushou
Fix infinite redirect loop on cart page

Fix for issue #6319:
https://github.com/woothemes/woocommerce/issues/6319
Fixing currency position in reports
Fixing order notes date
Tweak load_plugin_textdomain to be relative - this falls back to WP_LANG_DIR automatically. Can prevent "open_basedir restriction in effect".

@claudiosmweb agree? Load_plugin_textdomain needs a relative path. If
the locale isn’t found, it reverts to WP_LANG_DIR/plugins/ as you coded
it.
Merge branch 'master' of https://github.com/woothemes/woocommerce

Conflicts:
	readme.txt
Merge pull request #6301 from anagio/master

Small grammar edit to template notice
Merge pull request #6320 from ryanstockau/master

Fix infinite redirect loop on cart page
Fix - When bulk editing, don't allow sale price to be negative.

Fixes #6325
Check order exists before sending

Closes #6310
Fix adding items to orders

* Fix - When manually adding items to an order, show tax columns.
* Fix - When manually adding items to an order, include variation data.

Closes #6313
Merge pull request #1 from woothemes/master

Update to WC original
Forcing all images in a prettyphoto modal to be 100% width removes the ability for WC extension developers to use prettyphoto for inline content modals.
I was using it for a modal map for a WC extension, which broke < 768px because the tile images were 100% width.
This change makes images 100% width only when they are directly within the pp_full_res container, which is the behavior for image modals like the ones used by WC.
removing extra param and correcting whitespace
adding the after
loushou