Konstantin Kovshenin
c91922a004
Helper: Add a label to lifetime subscriptions.
2017-07-12 18:37:10 +03:00
Claudiu Lodromanean
14aaebd3f5
Merge pull request #16094 from woocommerce/fix/15256
...
Check we have an object before using product props
2017-07-12 08:25:04 -07:00
Mike Jolley
4c5bb1f0dd
Merge pull request #16076 from woocommerce/update/15563
...
New download tables
2017-07-12 16:20:34 +01:00
Mike Jolley
2fdb78a5b0
Update test to reflect new text
2017-07-12 16:18:43 +01:00
Mike Jolley
fdcf16bb60
Merge branch 'master' into update/15563
...
# Conflicts:
# assets/css/admin-rtl.css
# assets/css/admin.css
# assets/css/helper-rtl.css
# assets/css/helper.css
# assets/css/wc-setup-rtl.css
# assets/css/wc-setup.css
# assets/css/woocommerce-rtl.css
# assets/css/woocommerce.css
2017-07-12 16:18:13 +01:00
Claudiu Lodromanean
bce6e927bb
Merge pull request #16091 from woocommerce/fix/15763
...
Adjust variation name logic
2017-07-12 08:13:49 -07:00
Claudiu Lodromanean
de21898b70
Merge pull request #16090 from woocommerce/fix/16084
...
Sanitize keys in reports class
2017-07-12 08:05:11 -07:00
Mike Jolley
b3e0804462
Check we have an object before using product props
...
Fixes #15256
2017-07-12 15:58:54 +01:00
claudiulodro
0f134d2b6f
Begin product query
2017-07-12 07:44:53 -07:00
Mike Jolley
f110e81572
Fix select box styling in 2017
...
Fixes #15824
2017-07-12 15:39:12 +01:00
Mike Jolley
988b25b7ef
angola states ( #16092 )
...
* Added cantons of Angola
* fix cantons of Angola
fix cantons of Angola. Angola (ISO Country code)
Subdivision names are listed as in the ISO 3166-2 standard published by
the ISO 3166 Maintenance Agency (ISO 3166/MA).
source: https://en.wikipedia.org/wiki/ISO_3166-2:AO
* fix indentation
* fix indentation
* fix indentation update
* fix indenting again
2017-07-12 15:22:48 +01:00
Mike Jolley
022c528b3e
Remove value renaming code
2017-07-12 15:18:05 +01:00
Mike Jolley
6421b2a0be
Fix rtrim for non - separators
2017-07-12 15:17:48 +01:00
webspecnick
49ba871795
Add enclosure and escape arguments to importer. Introduce filter to change importer arguments ( #16053 )
...
* Introduce woocommerce_product_csv_importer_args filter.
* Add extra args to WC_Product_CSV_Importer. Have fgetcsv use extra args
* Update to follow coding standards.
2017-07-12 12:11:44 +01:00
Mike Jolley
58338354e5
Merge pull request #16085 from woocommerce/add-cross-sells-filter
...
Add cross-sells filter
2017-07-12 11:24:28 +01:00
Mike Jolley
25cbd4ada8
Sanitize keys in reports class
2017-07-12 10:53:39 +01:00
Mike Jolley
0b3b0058f5
Merge pull request #16087 from woocommerce/fix/race
...
Remove race condition
2017-07-12 09:58:06 +01:00
claudiulodro
4c4526424a
Remove race condition
2017-07-11 13:21:42 -07:00
claudiulodro
8dd21ec1c4
Resolve merge conflicts
2017-07-11 12:11:01 -07:00
claudiulodro
c557a71f14
Better phrasing
2017-07-11 12:04:43 -07:00
claudiulodro
0444cdef3c
Initial notice implementation
2017-07-11 11:59:39 -07:00
Caleb Burks
572cf3813f
Spacing/typo fix
...
Should really combine all three of these filters into one as well.
2017-07-11 13:37:43 -05:00
Caleb Burks
03d71cd8ee
Add filter for cart cross-sells
2017-07-11 13:33:51 -05:00
Claudio Sanches
fd1cb2d67f
Merge pull request #16052 from woocommerce/feature/13189-refactored
...
Add select2 to layered nav
2017-07-11 12:39:33 -03:00
Claudio Sanches
2335b5edf5
Merge pull request #16065 from mjangstadt/patch-1
...
Explicitly set include path
2017-07-11 12:30:01 -03:00
Mike Jolley
ca54ae0068
Merge pull request #16077 from woocommerce/fix/16072-2
...
[REST API] Check if is a valid instance of WC_Product before load data
2017-07-11 16:29:21 +01:00
Claudio Sanches
4262e83187
[REST API] Check if is a valid instance of WC_Product before load data
...
Closes #16072
2017-07-11 12:27:56 -03:00
Mike Jolley
651ca35067
Merge pull request #16075 from woocommerce/refactor/remove-legacy-code
...
Removed PayPal legacy code
2017-07-11 16:17:28 +01:00
Mike Jolley
e04ef935a9
Merge branch 'master' into update/15563
...
# Conflicts:
# templates/myaccount/my-downloads.php
# templates/order/order-details.php
2017-07-11 16:13:04 +01:00
Claudio Sanches
fa850ecfb4
Removed PayPal legacy code
2017-07-11 12:09:57 -03:00
Mike Jolley
b6847ebe60
remove exit
2017-07-11 16:09:31 +01:00
Mike Jolley
ce94a1f921
Plain
2017-07-11 16:08:06 +01:00
claudiulodro
f79c4a254c
Good progress
2017-07-11 07:52:40 -07:00
Claudiu Lodromanean
2f77f31f5e
Merge pull request #16068 from woocommerce/fix/16049
...
Ensure a valid order is found in order-details.php template
2017-07-11 07:48:10 -07:00
Mike Jolley
6462b67307
Merge pull request #16071 from websupporter/fix-typo-in-test
...
Fix typo in test (Solves #16070 )
2017-07-11 14:58:12 +01:00
Mike Jolley
94b32e644a
HTML emails
2017-07-11 14:52:30 +01:00
Mike Angstadt
00e8c9a505
removed leading slashes
...
removed leading slashes
2017-07-11 08:45:06 -05:00
Mike Angstadt
2239ad6dcb
updated based on reviewer feedback
...
Updated based on reviewer feedback.
2017-07-11 08:43:55 -05:00
Mike Jolley
3939f50ced
Download display in account/checkout
2017-07-11 13:45:35 +01:00
Websupporter
057c8b3281
Fix typo in test
...
Just a quick typo fix.
2017-07-11 14:43:54 +03:00
Mike Jolley
70420db6fd
Spacing
2017-07-11 11:31:02 +01:00
Mike Jolley
ba2063efa4
Merge pull request #15961 from electrokit/order_again_merge_option
...
Feature: Add option for merging when using 'Order Again'
2017-07-11 11:23:33 +01:00
Mike Jolley
fb784930f6
Ensure a valid order is found in order-details.php template
...
Closes #16049
2017-07-11 11:10:40 +01:00
Mike Jolley
bb39053211
Merge pull request #16066 from woocommerce/fix/rest-of-the-world-zone-copy-change
...
Change the "Rest of the World" zone name to "Locations not covered by your other zones" everywhere
2017-07-11 10:51:44 +01:00
Mike Jolley
5c32abfe6b
Merge pull request #16054 from woocommerce/fix/16043
...
Fix styling and connect button in non-english languages
2017-07-11 10:49:09 +01:00
Mike Jolley
be4a3fc99a
Typo in set_instance_id() method
...
Closes #16067
2017-07-11 10:38:50 +01:00
Terence O'Donoghue
8f6dc9588c
Fixed reference to deprecated WC_Order properties
2017-07-11 09:57:56 +01:00
Terence O'Donoghue
43eaa8356a
Fixed template reference spacing
2017-07-11 09:53:50 +01:00
Terence O'Donoghue
c5a75a5442
Use ::get_payment_method_title
2017-07-11 09:51:11 +01:00
Daniel Rey Lopez
04a83b0faa
Change the "Rest of the World" zone name to "Locations not covered by your other zones" everywhere
2017-07-11 08:19:42 +01:00