Commit Graph

6097 Commits

Author SHA1 Message Date
Coen Jacobs c800d83182 Merge pull request #4197 from tivnet/master
Corrected some PhpDocs in class-wc-cart
2013-11-25 06:43:38 -08:00
Coen Jacobs 4afbd0b556 Merge branch 'function-call-refactor'
Conflicts:
	includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php
	includes/shortcodes/class-wc-shortcode-cart.php
	includes/wc-template-functions.php
2013-11-25 15:42:26 +01:00
Mike Jolley d96661f45b Reverted template function names for @jameskoster's sanity 2013-11-25 14:35:10 +00:00
Mike Jolley b774e84e29 Revert "Replaced templates functions"
This reverts commit 4ce301a080.
2013-11-25 14:16:26 +00:00
Coen Jacobs 47ae00be28 Page functions woocommerce to wc refactor 2013-11-25 15:07:22 +01:00
Mike Jolley 51ba9c393f WC globals 2013-11-25 14:01:38 +00:00
Mike Jolley 3408965b8a Product functions 2013-11-25 14:01:38 +00:00
Mike Jolley 4ce301a080 Replaced templates functions 2013-11-25 14:01:37 +00:00
Mike Jolley 3973beae5d woocommerce_ functions to wc_ - replaced attribute functions 2013-11-25 14:01:37 +00:00
Coen Jacobs f7df17db1c Order functions woocommerce to wc refactor 2013-11-25 14:54:52 +01:00
Coen Jacobs c1a439eb99 Formatting functions woocommerce to wc refactor 2013-11-25 14:34:21 +01:00
Coen Jacobs 1663eafb68 Customer functions woocommerce to wc refactor 2013-11-25 13:52:53 +01:00
Coen Jacobs aaa14894ca Core functions woocommerce to wc refactor 2013-11-25 13:45:04 +01:00
Coen Jacobs b0e3802b5b Refactor cart functions in core 2013-11-25 13:44:32 +01:00
Gregory K f2e34496d0 Corrected some PhpDocs in class-wc-cart 2013-11-25 07:40:16 -05:00
James Koster 89c657d592 Merge pull request #4196 from tivnet/master
"export" is a reserved word in JavaScript
2013-11-25 04:29:25 -08:00
Coen Jacobs cb4e239655 Cart functions woocommerce to wc refactor 2013-11-25 13:23:39 +01:00
Gregory K 8539e81d79 "export" is a reserved word in JavaScript 2013-11-25 07:18:01 -05:00
Coen Jacobs a44702163f Remove deprecated loop-shop.php. Closes #4194 2013-11-25 12:11:59 +01:00
Coen Jacobs aa4d9d5914 Better order for admin settings tabs 2013-11-25 12:06:42 +01:00
James Koster cf64302063 woocommerce status dashboard widget #4042 2013-11-25 10:40:05 +00:00
James Koster 1e1ff450b5 site content dashboard widget #4042 2013-11-25 10:40:05 +00:00
Coen Jacobs 6377a2af6e esc_attr instead of esc_url for textarea placeholder
Closes #4195
2013-11-25 10:41:37 +01:00
Mike Jolley 77897a51bd PT Lang + readme 2013-11-25 08:52:49 +00:00
Coen Jacobs effc108af4 Merge pull request #4192 from maxrice/http-x-forwarded-host
Allow forwarded hosts for forced SSL
2013-11-25 00:44:41 -08:00
Coen Jacobs c9409892d7 Merge pull request #4189 from w-academy/master
Updated Danish Language files
2013-11-25 00:43:44 -08:00
Coen Jacobs e217bb291d Merge branch 'master' of https://github.com/woothemes/woocommerce 2013-11-25 09:42:11 +01:00
Coen Jacobs c0c12aad89 we jp do use states (closes #4186) 2013-11-25 09:41:34 +01:00
Coen Jacobs 2f3ed733fb Merge pull request #4182 from thenbrent/is-purchasable-check
Check products are purchasable when restoring cart
2013-11-25 00:39:16 -08:00
Coen Jacobs 084ac253f9 Merge pull request #4181 from kloon/fix_order_item_meta_ajax
Fix ajax calls for adding and deleting order item meta from the backend.
2013-11-25 00:38:50 -08:00
Coen Jacobs 65a1ed1b98 Fixed typo as merged in #4190 2013-11-25 09:38:03 +01:00
Coen Jacobs 2acc983956 Soft bumping version to beta-1 #4194 2013-11-25 09:29:11 +01:00
Coen Jacobs 8978f75f36 Remove safety net for calling WC_Product directly #4194 2013-11-25 09:25:45 +01:00
Coen Jacobs 7b63c6ce49 Remove parameters from function as well #4194 2013-11-25 09:19:24 +01:00
Coen Jacobs 73215ba4e2 Remove 2.0 tax deprecated arguments #4194 2013-11-25 09:17:44 +01:00
Coen Jacobs 6acfff9879 Fixed field matching in setting up variations 2013-11-25 09:05:27 +01:00
Andrew Benbow 437b224f7b Fix variations not showing in all cases for draft products 2013-11-25 09:03:07 +01:00
Andrew Benbow 0f29761268 Bracing 2013-11-25 09:02:51 +01:00
Max Rice 72316d0b5f Allow forwarded hosts for forced SSL 2013-11-24 22:39:23 -05:00
Coen Jacobs 8054316fa6 Merge pull request #4185 from maxrice/rest-api-fixes-issue-4055
Various fixes for REST API
2013-11-24 12:58:25 -08:00
Coen Jacobs e9691eed7f Merge pull request #4184 from maxrice/api-order-status-update-issue-4161
Implement order status update endpoint
2013-11-24 12:58:15 -08:00
w-academy f9bc8c96c6 Updated Danish Language files 2013-11-24 16:46:27 +01:00
Andrew Benbow 2d03022b76 Brace all the things 2013-11-24 10:24:12 +00:00
Max Rice c00e2d0f8c Add total customers count to sales report
Part of #4055
2013-11-23 17:27:24 -05:00
Max Rice 017e7cee1d Add permissions for count endpoints 2013-11-23 17:11:16 -05:00
Max Rice 2af47c6699 Fix incorrect total results number for pagination headers 2013-11-23 16:37:28 -05:00
Max Rice 0be58b3390 Normalize response data types
Part of #4055
2013-11-23 16:36:56 -05:00
Max Rice 20fb7e771f Add total sales property to products response 2013-11-23 15:17:14 -05:00
Max Rice 3bc8fae631 Remove PUT/DELETE endpoints
Will be implemented in 2.2

Part of #4055
2013-11-23 15:01:53 -05:00
Max Rice a0cb0cbb4e Remove schema link 2013-11-23 14:41:21 -05:00