Commit Graph

13228 Commits

Author SHA1 Message Date
Nicola Mustone 6bc17c65c8 delete to unset 2015-09-16 11:34:03 +02:00
Nicola Mustone 1a156d89b3 Merge branch 'shortcodes-category' of github.com:SiR-DanieL/woocommerce into shortcodes-category
Conflicts:
	includes/class-wc-shortcodes.php
2015-09-16 09:29:15 +02:00
Nicola Mustone ffc941fcb1 rebase shortcakes category 2015-09-16 09:26:30 +02:00
Claudio Sanches 2a31d1fe98 Merge branch 'master' of github.com:woothemes/woocommerce 2015-09-15 22:06:18 -03:00
Claudio Sanches 8ed7754e49 Fixed strings with "MasterCard", closes #9142 2015-09-15 22:06:02 -03:00
Claudio Sanches 265a912985 Merge pull request #9138 from woothemes/added-changelog-for-api-changes
Added changelog to 2.5.0 for API related changes.
2015-09-15 20:01:53 -03:00
Claudio Sanches ab921ea82c Merge pull request #9088 from khag7/khag7-patch-1
Filter the array which determines what classes are applied to an order note
2015-09-15 20:01:33 -03:00
Claudio Sanches f7d035e739 Merge pull request #9084 from rchq/patch-1
Added an action for notifications
2015-09-15 19:59:16 -03:00
Claudio Sanches ebedba7906 Merge pull request #9081 from helgatheviking/filter-admin-order-item-thumbnails
Add `woocommerce_admin_order_item_thumbnail` filter in admin
2015-09-15 19:58:23 -03:00
Claudio Sanches f447a66281 Introduces woocommerce_update_new_customer_past_order action, closes #9078 2015-09-15 19:56:59 -03:00
Claudio Sanches 9865e04c8a Merge pull request #8921 from shivapoudel/wc-tabs-gtm
GTM listener for wc-tabs
2015-09-15 19:49:48 -03:00
Claudio Sanches 7e63374aaf Merge pull request #8735 from shivapoudel/backbone-modal
Allow support for variable in backbone modal template in extensions
2015-09-15 19:44:50 -03:00
Claudio Sanches 376b13aece [API] Sanitize product image alt attribute 2015-09-15 14:25:43 -03:00
Claudio Sanches d7c25e3051 Merge pull request #9136 from mikaelmattsson/master
Make the image properties alt and title writable in the REST API v3, closes #8860
2015-09-15 13:15:20 -03:00
James Koster 82f8b61418 make it clearer that variation drag/drop only applies to the backend. closes #9104 2015-09-15 17:05:55 +01:00
Akeda Bagus f061e96677 Added changelog for API related changes. 2015-09-15 10:49:29 -05:00
Mike Jolley 4e063fb069 Merge pull request #8925 from shivapoudel/hidden-meta-boxes
Hides 'custom fields' section by default in product
2015-09-15 16:47:05 +01:00
Mike Jolley cc875d7b94 Merge pull request #8939 from SiR-DanieL/_x
Added some comments on translations
2015-09-15 16:45:39 +01:00
Mike Jolley 3e55364e3a Merge pull request #8940 from woothemes/issues/8482
Tidy up how we're dealing with coupon postmeta around `_used_by` which can get big.
2015-09-15 16:42:51 +01:00
Mikael Mattsson d3302a9fa8 Merge branch 'master' of https://github.com/woothemes/woocommerce
# By Akeda Bagus (4) and Beka Rice (1)
# Via Mike Jolley (3) and others
* 'master' of https://github.com/woothemes/woocommerce:
  Added more products query filter for REST API.
  Added support to GET, POST, PUT, and DELETE tags.
  Added support to POST, PUT, and DELETE categories.
  Added API support for product shipping classes.
  [2.5] Filter when purchase note is showed
2015-09-15 17:28:42 +02:00
Mike Jolley d754ad79c8 Merge pull request #9082 from bekarice/purchase-note-improvements
[2.5] Filter when purchase note is showed
2015-09-15 16:21:49 +01:00
Claudio Sanches b8172b173e Merge pull request #9135 from woothemes/issues/8971-filter-products-by-tax
Added more products query filter for REST API.
2015-09-15 12:19:36 -03:00
Mike Jolley c4fa25c09e Merge pull request #9100 from woothemes/issues/8879-categories-tags-api-addition
Added support to POST, PUT, and DELETE categories/tags.
2015-09-15 16:17:50 +01:00
Mikael Mattsson ac49411146 Make the image properties alt and title writable in the REST API v3. 2015-09-15 17:17:14 +02:00
Mike Jolley b2749c3939 Merge pull request #9118 from woothemes/issues/8948
Added API support for product shipping classes.
2015-09-15 16:15:52 +01:00
Mike Jolley 7af7f1f6da Master branch is now 2.5.0-dev 2015-09-15 16:08:17 +01:00
Mike Jolley 0830543c4f Add disclaimer to woocommerce_adjust_non_base_location_prices 2015-09-15 16:01:11 +01:00
Mike Jolley 4959937689 Merge branch 'universal-pricing-test' 2015-09-15 15:57:04 +01:00
Akeda Bagus 97565ef9a1 Added more products query filter for REST API.
The new filters are taxonomies related: tag, shipping class, and
attribute. The code was refactored a bit so all taxonomies query are
wrapped within tax_query.
2015-09-15 07:18:28 -05:00
Mike Jolley 9f1a5e3c26 Remove unused arg 2015-09-15 12:51:45 +01:00
Mike Jolley 0164584aaf Reduce stock once and record in _order_stock_reduced meta
Also clears up the payment_complete method
2015-09-15 12:39:16 +01:00
Mike Jolley 96814b992f Show more variations per page 2015-09-14 16:54:58 +01:00
Mike Jolley 3dbe9ccd95 Better fallback for ajax variations in case sync_attributes has ran 2015-09-14 16:50:58 +01:00
Mike Jolley 8e19abe368 Check if $breadcrumb is empty 2015-09-14 15:56:58 +01:00
Mike Jolley fc78f85bc6 Merge branch 'pr/9034' 2015-09-14 15:56:38 +01:00
Mike Jolley 3a1bcd8e7d Store prices in class to prevent running get_variation_prices multiple times 2015-09-14 15:09:57 +01:00
Mike Jolley 2d90e1c6c6 Ensure _product_version checks act the same regardless of the attributes being checked 2015-09-14 12:12:05 +01:00
Mike Jolley 14c0a3ce90 Merge pull request #9117 from panvagenas/master
issue #9116
2015-09-14 10:47:54 +01:00
Akeda Bagus 6906eb4eae Added support to GET, POST, PUT, and DELETE tags. 2015-09-13 17:59:07 +07:00
Akeda Bagus 2980ffd66b Added support to POST, PUT, and DELETE categories. 2015-09-13 17:59:07 +07:00
Akeda Bagus f781d393c8 Added API support for product shipping classes.
This change implements GET, POST, PUT, and DELETE handlers for shipping
classes endpoint, /products/shipping_classes.

Fixes #8948.
2015-09-13 17:54:23 +07:00
Panagiotis Vagenas 8e37f8d0a5 #9116. Moving the action outside the curly braces will do the trick. 2015-09-13 10:03:25 +03:00
Claudio Sanches 4a774943e9 Merge pull request #9113 from woothemes/issues/9110-fix-failed-log-test
Assert log line format and its log message instead of log line equality.
2015-09-12 16:51:46 -03:00
Akeda Bagus f3dfdd20da Assert log line format and its log message instead of log line equality.
Timestamp is not reliable to assert during the test.
2015-09-12 21:18:41 +07:00
Claudio Sanches 03ed840a79 Merge pull request #9109 from SiR-DanieL/related-products-args
Wrong per_page attribute
2015-09-11 18:24:56 -03:00
Mike Jolley 8b601adb3c Merge pull request #9108 from woothemes/issues/9101-dont-show-undo-if-product-is-not-purchasable
Don't show undo link if removed item product is out of stock.
2015-09-11 11:33:32 +01:00
Nicola Mustone cc3962cddb wrong per_page attribute 2015-09-11 10:53:26 +02:00
Akeda Bagus 82a7c70334 Don't show undo link if removed item product is out of stock. 2015-09-11 15:22:09 +07:00
Claudio Sanches 95de4a8d23 Merge pull request #9103 from woothemes/revert-9098-issues/8948
Revert "Added API support for product shipping classes."
2015-09-10 14:22:21 -03:00
Claudio Sanches 194f9cd6ec Revert "Added API support for product shipping classes." 2015-09-10 14:22:11 -03:00