Commit Graph

36 Commits

Author SHA1 Message Date
Mike Jolley 3dba3378c2 Merge pull request #10315 from woothemes/layered-nav-wp-query
Layered Nav Improvements
2016-02-12 11:59:40 +00:00
Mike Jolley bc83a04c6c Feedback from Justin 2016-02-11 11:13:48 +00:00
Mike Jolley 114cbdd450 Autoload tweaks 2016-02-09 23:26:22 +00:00
Mike Jolley 1076854608 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/class-wc-shipping.php
#	includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
#	includes/shipping/flat-rate/includes/class-wc-eval-math.php
#	includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
Mike Jolley ad11042afd [2.4] Don't unforce SSL on secure blogs
@claudiosmweb can you check this and cherry pick if good to go?

Fixes #10029
2016-01-08 11:27:18 +00:00
Mike Jolley 97d47fb576 Move zones to main settings 2016-01-05 11:23:15 +00:00
Andrew Benbow d4f4e7625c Correct a to an
SSL is pronounced "es es el" and so requires an not a, see Use 6 here http://www.englishpage.com/articles/a-vs-an.htm
2015-12-29 20:35:13 +00:00
Claudio Sanches 987b93c87e Changed (Untitled) to (no title) #9806 2015-12-09 16:28:34 -02:00
Claudio Sanches 2a5b785e50 Show (Untitled) in settings when payment method don't have title
Fixed some coding standards too.

Closes #9806
2015-12-09 15:11:59 -02:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Mike Jolley ed451f278f Unused var 2015-07-15 16:37:29 +01:00
Mike Jolley 1e3fcd0e6d [2.3] Avoid initialising classes when saving 2015-05-29 17:38:25 +01:00
Matt Harrison b656ef904a minor grammar fix. "an SSL" to "a SSL" 2015-05-18 09:03:51 -04:00
Mike Jolley 9f65d2a1fc Added priorities for shipping methods to give more control over defaults.
Closes #7871
2015-04-13 15:32:57 +01:00
Mike Jolley aed8ae36cf woocommerce_calc_discounts_sequentially option to keep backwards compatible 2015-03-24 15:51:53 +00:00
Mike Jolley b289c9446c WC_INSTALLING constant - don't create options for any gateways/shipping methods during install. 2015-01-23 13:05:38 +00:00
Mike Jolley 50c6e1e4a0 select2 settings 2015-01-12 16:29:01 +00:00
shivapoudel ab52b93592 Absolute path and Indentation fix for includes/admin/settings/*.php :) 2014-09-21 01:40:47 +05:45
Mike Jolley aee2b62c85 Added woocommerce_get_settings_ID filters.
Closes #6231
2014-09-12 12:20:06 +01: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
Mike Jolley 6bd38b5ce0 Tweak display order text 2014-08-15 11:50:53 +01:00
Mike Jolley 0dd8dcba2e Update label for force http option Closes #5474 2014-05-15 12:40:08 +01:00
Remi Corson 7e955ba1f9 fixed incorrect order received endpoit tooltip 2014-04-17 11:03:47 +02:00
Mike Jolley 31ee45cf5c Add context to strings #4986 2014-03-03 14:47:19 +00:00
Mike Jolley f9251084d9 woocommerce_get_sections_{id} filters Closes #4817 2014-02-17 14:30:42 +00:00
Mike Jolley 2dd73acb9d Context for checkout string Closes #4646 2014-02-06 15:46:18 +00:00
Brent Shepherd b69066405b Move /add-payment-method/ endpoint to /my-account/
Part of #3396
2013-11-05 13:02:13 -08:00
thenbrent 1bbe03d139 Add new /checkout/add-payment-method/ endpoint
Part of #3396
2013-11-03 16:53:14 -08:00
RistoNiinemets a96cb41c83 no dot use ucfirst nor ucwords for method title 2013-10-25 18:44:17 +03:00
RistoNiinemets ae00faecdd change ucwords to ucfirst 2013-10-25 13:53:53 +03:00
Mike Jolley 8ce3b8dd57 Filters for shortcode tags 2013-10-23 14:55:18 +01:00
Mike Jolley 05d9c0e045 Rename menus, removed woocommerce_ 2013-10-22 17:26:18 +01:00
Mike Jolley b6e7eeb241 Support no default and make the gateway/shipping tables more streamlined. Closes #3472 2013-09-09 17:16:02 +01:00
Mike Jolley 126068de8c Moved options around for checkout settings. 2013-08-22 12:11:19 +01:00
Mike Jolley 3d078397b3 Merge branch 'Re-organise-settings'
Moves settings together. Fixes #3497
2013-08-22 11:58:03 +01:00