Commit Graph

9706 Commits

Author SHA1 Message Date
Ninos Ego 0f6b4cae5f Merge remote-tracking branch 'upstream/master'
Conflicts:
	i18n/languages/woocommerce-admin.pot
	i18n/languages/woocommerce.pot
	includes/api/class-wc-api-orders.php
	includes/gateways/paypal/class-wc-gateway-paypal.php
	templates/global/breadcrumb.php
2014-09-02 21:02:22 +02:00
thenbrent 4dea71314f Add 'wc_order_is_editable' filter 2014-09-02 11:49:05 -07:00
thenbrent 78d932e6d2 Add WC_Abstract_Order::is_editable()
To centralise logic used to determine if an order can be edited from
the Edit Order screen
2014-09-02 11:47:56 -07:00
Shiva Poudel 394e1698e5 Improved .editorconfig for *.json and *.md 2014-09-03 00:26:43 +05:45
Mike Jolley 76bccd4ddb Merge pull request #6151 from woothemes/feature-simplify-pre-orders
Feature simplify pre-orders
2014-09-02 15:17:51 +01:00
claudiosmweb 08af487754 added simplify pre-orders support 2014-09-02 11:11:21 -03:00
claudiosmweb 54aa162fb4 renamed the simplify "subscriptions" class to "addons" 2014-09-02 10:21:42 -03:00
Mike Jolley db38fc81f9 Added travis png and link 2014-09-02 09:35:22 +01:00
Mike Jolley c3b2a24933 Merge pull request #6147 from maxrice/feature-3176-unit-tests
Add Unit Testing Suite
2014-09-02 09:15:50 +01:00
Mike Jolley fb2eb37fd0 Merge pull request #6146 from axisthemes/title
Title for Docs and API Docs Modified
2014-09-01 22:39:40 +01:00
Max Rice 0bd7d8990c [#3176] Refactor bootstrap
* Adjust load and install order
* Fix issue with stale capabilities after install
2014-09-01 16:11:48 -04:00
Max Rice 50253bc8b6 [#3176] Use shop manager role for API tests 2014-09-01 16:11:08 -04:00
shivapoudel 1ae67fb37e Change title for API Docs #6132 2014-09-02 00:02:51 +05:45
shivapoudel 86c1e7ed01 Change title for Documentation #6132 2014-09-02 00:02:11 +05:45
claudiosmweb 063d1eb349 fixed the access permissions 2014-09-01 12:44:51 -03:00
claudiosmweb cd154a30ef improved the line items backward compatibility, closes #6109 2014-09-01 12:35:04 -03:00
Mike Jolley 689272f9b9 Change title text from #6132 2014-09-01 12:46:37 +01:00
Mike Jolley f9af86ee1d Merge pull request #6132 from axisthemes/action-links
Action links Has now Better Look in Multisite Too.
2014-09-01 12:44:34 +01:00
Mike Jolley de4eaeac89 Merge pull request #6137 from shivapoudel/patch-1
Time Constant HOUR_IN_SECONDS
2014-09-01 12:36:14 +01:00
Mike Jolley 7b304e54dd Merge pull request #6140 from maxrice/v2-rest-api-tweaks
v2 REST API Tweaks
2014-09-01 12:36:02 +01:00
Mike Jolley 91149c4ac3 Backwards ship-to-different-address logic on checkout.
When you choose the option to ship to billing only, the second
condition would make the checkout try to set shipping address to
non-existent fields. cc @claudiosmweb
2014-09-01 10:54:16 +01:00
Max Rice 38dd928f23 [#3176] REST API webhooks endpoint tweaks from unit test 2014-09-01 03:27:19 -04:00
Max Rice 4cffe3182f [#3176] Add readme 2014-09-01 03:26:26 -04:00
Max Rice 9730201e08 [#3176] Add woocommerce class tests 2014-09-01 02:59:35 -04:00
Max Rice 93485e0891 [#3176] Add core function tests 2014-09-01 02:59:23 -04:00
Max Rice 17a1918991 [#3176] Add webhooks REST API endpoint tests
100% coverage :)
2014-09-01 02:04:49 -04:00
Max Rice 27f378bf4e [#3176] Add unit test framework 2014-09-01 02:04:02 -04:00
Max Rice 71def57a7d [#3176] Add unit test boostrap 2014-09-01 02:03:52 -04:00
Max Rice cf50957629 [#3176] Clean up gitignore 2014-09-01 02:00:12 -04:00
Tamara Zuk a0ce139f7d Coding Standards: Admin - Settings
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 04:22:03 -04:00
Tamara Zuk 0ab6b44bfa Coding Standards: Admin - Reports
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 03:19:13 -04:00
Tamara Zuk fc0e7adacb Coding Standards: Admin - Meta boxes
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 03:18:21 -04:00
Tamara Zuk ce037af961 Coding Standards: Admin - Importers
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 03:17:58 -04:00
Tamara Zuk 0db4ab0f83 Coding Standards: Admin JS
Fixed spacing as per
http://make.wordpress.org/core/handbook/coding-standards/javascript/
2014-08-31 02:25:22 -04:00
Tamara Zuk e7dd92f369 Coding Standards: Less files
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
2014-08-31 01:51:21 -04:00
Tamara Zuk 9c7826319c Coding Standards: Abstract classes
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 01:49:58 -04:00
Tamara Zuk 59424e5fcf Coding Standards: Main plugin file
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 01:41:40 -04:00
Max Rice 456d10bcec REST API: allow coupon description in create/edit coupon 2014-08-30 18:43:47 -04:00
Max Rice 53b53114a7 REST API: Fix edit coupon typos 2014-08-30 18:43:26 -04:00
Max Rice 28536f6bd8 REST API: allow adding/updating order meta
When creating or updating orders, non-protected scalar meta can now be
set.
2014-08-30 16:17:52 -04:00
Max Rice ee8bf5bf18 REST API: tweak filter name from #6084 2014-08-30 16:16:51 -04:00
Max Rice 744c3767c3 REST API: ensure consistency in create/edit data formats
A client should be able to GET a resource, edit a single item and PUT
it back to the server without having to perform any additional
transformation. This commit ensures all PUT/POST endpoints adhere to
this standard.
2014-08-30 15:50:40 -04:00
Max Rice e1a542498d Fix notice introduced in #6084 2014-08-30 15:14:59 -04:00
Max Rice 722f888453 REST API: Add field restriction to new endpoints 2014-08-30 15:05:36 -04:00
Max Rice ec0f92878e REST API: Add order statuses endpoint 2014-08-30 15:05:31 -04:00
Max Rice f87ccd364c REST API: Mitigate possible JSONP flash attacks
see http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
2014-08-30 15:05:25 -04:00
Max Rice b1b7d6257b REST API: Fix JSONP content-type 2014-08-30 15:05:12 -04:00
Shiva Poudel 7ddedad4a7 Time Constant HOUR_IN_SECONDS
_wc_activation_redirect transient have HOUR_IN_SECONDS instead `60*60`.
2014-08-31 00:38:48 +05:45
Max Rice 5b68ec6c80 Backport get_avatar_url() fix to v1 REST API 2014-08-30 13:38:45 -04:00
shivapoudel 77cbf46fdf It's not necessary to include deploy folder for checktextdomain task 2014-08-30 02:57:06 +05:45