Commit Graph

9088 Commits

Author SHA1 Message Date
Mike Jolley 9775170eff Merge pull request #6169 from axistools/makepot
Makepot now Supports PoEdit Header
2014-09-05 10:12:35 +01:00
Mike Jolley ad78caf955 Merge pull request #6171 from maxrice/fix-simplify-js-load
Don't load simplify javascript when simplify gateway isn't available
2014-09-05 10:04:51 +01:00
Mike Jolley b03536de0f Merge pull request #6167 from BFTrick/iss-6166
Fix for 6166
2014-09-05 10:01:50 +01:00
Max Rice 81b50b6bd6 Notice functions tweaks 2014-09-05 02:37:12 -04:00
Max Rice 0e4a4ef787 Add unit tests for notice functions 2014-09-05 02:36:46 -04:00
Max Rice c1b4d16b9d Add unit tests for coupon functions 2014-09-05 02:36:35 -04:00
Max Rice 02adbfa110 Unit Tests: add mock session handler 2014-09-05 02:35:53 -04:00
Max Rice ee25790fb9 Don't load simplify javascript when gateway isn't available 2014-09-04 20:27:43 -04:00
Shiva Poudel 92add4a6f7 No support for PoEdit and updated packages.json 2014-09-05 00:46:17 +05:45
Shiva Poudel 1c5bec75cd Arrange devDepedencies alphabetically and updated
Updated grunt-wp-i18n especially to support PoEdit Headers and optionally grunt-shell too.
2014-09-05 00:09:47 +05:45
Shiva Poudel 73c46c11b1 Add support for PoEdit Headers 2014-09-05 00:02:01 +05:45
claudiosmweb bf4ca33150 now is official o/ 2014-09-04 13:33:27 -03:00
Patrick Rauland e202926f73 remove check to make sure order is complete before downloading. fixes #6166 2014-09-04 10:31:38 -06:00
Ninos Ego dcc9988a89 Merge remote-tracking branch 'upstream/master' 2014-09-04 17:34:49 +02:00
Mike Jolley 8fc5d895eb Grunt dev 2014-09-04 15:14:27 +01:00
Mike Jolley a3ad573aa7 Merge pull request #6164 from barrykooij/master
Removed the 'delete_users' case.
2014-09-04 12:34:16 +01:00
Barry Kooij 73648c1b91 Removed the 'delete_users' case.
Related #6102
2014-09-04 13:30:48 +02:00
Mike Jolley 9e25450572 Replaced get_language call for get_locale 2014-09-04 11:38:36 +01:00
Mike Jolley fd0a9e52b6 Replace usage of WPLANG with get_locale() for installs without WPLANG set
cc @claudiosmweb
2014-09-04 11:33:30 +01:00
Mike Jolley 20407c8cc0 Fix extra delimiter in breadcrumbs Closes #6153 2014-09-04 10:17:19 +01:00
Mike Jolley 40c528dc3a Queue language check on install + store checked lang code in option
@claudiosmweb
2014-09-04 09:37:24 +01:00
Mike Jolley e0951bdf17 Merge pull request #6160 from splashingpixels/rich-snippet
reverted rich snippet currency to priceCurrency due to a typo in Googles...
2014-09-04 08:46:51 +01:00
splashingpixels 91768526de reverted rich snippet currency to priceCurrency due to a typo in Googles Rich Snippets docs 2014-09-03 19:06:44 -07:00
Mike Jolley 1d13f767b3 Merge pull request #6157 from tamarazuk/coding-standards
Coding standards Part 1
2014-09-03 17:05:42 +01:00
claudiosmweb 1d2d49634c updated the language files 2014-09-03 12:22:05 -03:00
Mike Jolley 349c85b639 Remove redundant wc_order_can_be_edited filter
#6154
2014-09-03 10:09:31 +01:00
Mike Jolley 265ffee23a Remove $can_be_edited in favour of ->is_editable()
For #6154
2014-09-03 10:09:04 +01:00
Mike Jolley cb76bd7fb8 Merge pull request #6154 from thenbrent/is_editable
Add `WC_Abstract_Order::is_editable()` method and `'wc_order_is_editable'` filter
2014-09-03 10:06:04 +01:00
Mike Jolley 86d3fc227f Merge pull request #6155 from thenbrent/paypal_api_creds_help
Add a link to PayPal's guide on API Creds
2014-09-03 09:57:38 +01:00
Mike Jolley ed75a7ad04 Merge pull request #6152 from shivapoudel/patch-1
Improved .editorconfig for *.json and *.md
2014-09-03 09:54:25 +01:00
thenbrent ac80c8b51c Add a link to PayPal's guide on API Creds 2014-09-02 14:44:17 -07:00
claudiosmweb 78c7fefe3e fixed some docblocks 2014-09-02 16:50:19 -03:00
thenbrent 3acfb14214 Store order's editable status in property
To save overhead of a function call
2014-09-02 12:27:26 -07:00
Ninos Ego 4d4a24986b Solve conflicts 2014-09-02 21:23:50 +02:00
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