f83a6c0850
Merge remote-tracking branch 'upstream/master'
2016-02-13 22:59:28 +00:00
3dba3378c2
Merge pull request #10315 from woothemes/layered-nav-wp-query
...
Layered Nav Improvements
2016-02-12 11:59:40 +00:00
e938fdddd2
Modified scope of WC_Shipping_Method methods
...
* A "private" scope is rarely required, and it prevents extensibility. Having methods accessible by descendant classes is vital, especially when breaking changes are introduced.
2016-02-11 17:25:38 +00:00
bc83a04c6c
Feedback from Justin
2016-02-11 11:13:48 +00:00
d598e6ffad
Tooltip
2016-02-10 14:11:32 +00:00
75c264837f
Justins feedback/code tidy
2016-02-10 13:21:16 +00:00
114cbdd450
Autoload tweaks
2016-02-09 23:26:22 +00:00
78296adf67
Missin list element
2016-02-05 15:45:32 +00:00
352184cc06
Merge branch 'master' into shipping-zones
...
# Conflicts:
# assets/css/admin.css
# i18n/languages/woocommerce.pot
# includes/abstracts/abstract-wc-payment-gateway.php
# includes/abstracts/abstract-wc-shipping-method.php
# includes/admin/settings/class-wc-settings-shipping.php
# includes/wc-core-functions.php
# uninstall.php
2016-02-05 14:58:48 +00:00
8c85183d6e
[2.5] Remove case check from tax rate country REGEX
2016-01-27 12:10:36 +00:00
e87007d5cd
[2.5] Fixed tax row autocomplete htmlentity, closes #10149
2016-01-23 14:32:09 -02:00
6277d96770
Stop direct access
2016-01-19 15:57:03 -02:00
b788418283
Load shipping methods during save
...
Fixes #10072
2016-01-14 13:24:02 +00:00
d821b87f8a
Move shipping classes to custom UI in shipping section
2016-01-13 16:52:28 +00:00
8064b35350
Add methods from zones screen
2016-01-13 15:04:10 +00:00
31be09073f
Show zones if no matching shipping method is found
2016-01-13 12:41:54 +00:00
c8025705c1
Text changes
2016-01-13 12:38:31 +00:00
6a8819fc23
Text changes
2016-01-13 12:31:10 +00:00
68e30f0f38
Zones page text
2016-01-13 12:12:58 +00:00
636e2389aa
Changed … to …
2016-01-12 14:03:01 -02:00
70a9eb3807
Fix pagination + sorting on tax screen
...
@claudiosmweb
2016-01-12 12:01:10 +00:00
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
accc62d5ef
Breadcrumb tweak
2016-01-08 12:10:40 +00:00
cef3ec7e37
Indicate disabled methods
2016-01-08 11:57:49 +00:00
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
72f062b452
Improve docblock comments in WC_Settings_* classes
...
* Added comments to properties that don’t have any.
2016-01-05 16:22:18 +01:00
97d47fb576
Move zones to main settings
2016-01-05 11:23:15 +00:00
62ca37f651
Merge branch 'master' into shipping-zones
...
# Conflicts:
# includes/admin/class-wc-admin-assets.php
# includes/class-wc-install.php
2016-01-04 14:35:45 +00:00
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
8aec02f625
Remove shipping select box option, tidy up logic and add filters from #9797
...
closes #9797
2015-12-16 13:00:16 +00:00
d7d70298c5
#9857 change get_class to
2015-12-16 14:25:17 +08:00
9818796d3e
Removing selection priority
...
This option was added so you could sort methods in a custom order, but
choose a different default.
Doing this per zone would add extra complexity, and this has also
proven problematic when a method registers multiple rates.
This commit removes usage of the setting. We should use the display
order and choose the top method by default. It think this balances ease
of use with control.
2015-12-15 15:49:35 +00:00
63f8eebd6a
Started on refactoring settings for instances
2015-12-11 16:41:38 +00:00
987b93c87e
Changed (Untitled) to (no title) #9806
2015-12-09 16:28:34 -02:00
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
d585e65e5a
Use cache and invalidation for taxes
...
Closes #9712
2015-12-02 15:53:54 +00:00
1756aa8fca
Use help tip function in email table.
2015-11-03 16:12:13 +00:00
1b38f380af
Merge remote-tracking branch 'origin/master'
...
Conflicts:
includes/emails/class-wc-email.php
2015-11-03 16:09:01 +00:00
1e945026b3
Tweak screen description
2015-11-03 15:41:31 +00:00
8457dbb57d
Display if emails are manually sent
2015-11-03 15:40:10 +00:00
d95f863d79
Show descriptions inline
2015-11-03 15:04:29 +00:00
5893875b0c
Removed period for file headers
2015-11-03 11:53:50 -02:00
ee30b5b308
Fixed php docs standards
2015-11-03 11:31:20 -02:00
5f65494e27
Restructure emails admin to avoid listing emails along the top
...
Moves emails to a table on the settings screen.
Also tweaks some section text and moves descriptions to tooltips for a
less cluttered interface.
2015-11-02 16:27:00 +00:00
b85ae9056c
Rename wc_add_help_tip() function to wc_help_tip()
2015-10-23 13:09:08 -02:00
2e95a68357
Use new "question" mark icon font
...
Created wc_add_help_tip() function to generate the icons
Replaced all .help_tip elements and [?]
We'll keep the old image and styles in order to maintain backwards
compatibility
Closes #9381
2015-10-23 01:40:52 -02:00
d5409f5b5e
Merge conflicts
2015-10-08 13:28:25 +01:00
0197a99065
Merge branch 'issue/8587'
...
Conflicts:
assets/css/admin.css
assets/css/woocommerce.css
includes/admin/class-wc-admin-assets.php
includes/admin/settings/views/html-settings-tax.php
2015-10-08 13:26:52 +01:00
8ee479afd7
Remove unused input
2015-10-08 13:25:01 +01:00
ac02ec290a
Improved styling and wording
2015-10-08 13:18:00 +01:00
Diego Zanella
Mike Jolley
Claudio Sanches
Fredrik Forsmo
Andrew Benbow
Fulvio Notarstefano