Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,678 Commits 1,431 Branches 772 Tags 967 MiB
Commit Graph

23678 Commits

Author SHA1 Message Date
Mike Jolley ba3d959e66 Merge branch 'master' into pr/17183 2017-10-27 18:49:27 +01:00
Mike Jolley e3172e53dd
Merge pull request #17419 from woocommerce/fix/jquery-wrapper 
Fixed missing jQuery wrapper
 2017-10-27 18:46:16 +01:00
Claudio Sanches e81c03fdb0 Uglify JS files 2017-10-27 15:41:27 -02:00
Claudio Sanches a0ef49164f Fixed missing jQuery wrapper 2017-10-27 15:40:05 -02:00
Claudio Sanches 8130fc9c38
Merge pull request #17356 from Umangvaghela/backbonejs-changes 
Add correct method to define new in a backbone
 2017-10-27 15:36:35 -02:00
Mike Jolley 75d390e2a9 Readme 2017-10-27 17:07:06 +01:00
Mike Jolley 349e37399f Merge branch 'pr/17315' 2017-10-27 16:42:32 +01:00
Mike Jolley 3c3173b2f8 Rename actions and handle deprecation 2017-10-27 16:42:19 +01:00
Claudio Sanches b45df5dca1 Merge pull request #17407 from woocommerce/fix/17353 
Handle defaults + locale without clearing defaults
 2017-10-27 13:40:55 -02:00
Mike Jolley 422638bf75 Merge branch 'pr/17344' 2017-10-27 16:23:15 +01:00
Mike Jolley e72a297842 Break up logic so is callable is only checked on internal meta keys 2017-10-27 16:23:05 +01:00
Mike Jolley a6e5a684d0 Merge branch 'pr/17134' 2017-10-27 16:07:41 +01:00
Mike Jolley e5038e737e Standards 2017-10-27 16:07:30 +01:00
Mike Jolley 5124b2d503 Merge remote-tracking branch 'origin/master' 2017-10-27 16:00:01 +01:00
Mike Jolley 35f5140e1c Merge branch 'pr/17137' 2017-10-27 15:59:56 +01:00
Mike Jolley 47bb63733b Standards 2017-10-27 15:59:47 +01:00
Mike Jolley 7ec8cdbc21 Merge pull request #17192 from Umangvaghela/use-strict 
'use strict' in jQuery file
 2017-10-27 15:54:41 +01:00
Mike Jolley ced4551413 Merge branch 'pr/16986' 2017-10-27 15:49:00 +01:00
Mike Jolley 7cafc71526 Wording tweaks 2017-10-27 15:48:50 +01:00
Mike Jolley 8695d46637 Merge branch 'pr/17041' 2017-10-27 15:35:43 +01:00
Mike Jolley bfebd204ee Code standards and better action names 2017-10-27 15:35:34 +01:00
Mike Jolley 0ea2264033 Merge pull request #17317 from woocommerce/remove/legacy-rest-api-files 
Removed legacy WordPress REST API files
 2017-10-27 15:26:34 +01:00
Mike Jolley 22ee1810de Merge remote-tracking branch 'origin/master' 2017-10-27 15:21:18 +01:00
Mike Jolley 43c77c51b5 Merge branch 'pr/17139' 2017-10-27 15:21:12 +01:00
Mike Jolley 6a7af9897a Standards 2017-10-27 15:21:03 +01:00
Mike Jolley 2d021e3786 Merge pull request #17077 from grosssmutttr/patch-2 
Update class-wc-widget-layered-nav.php - Avoid duplicate content
 2017-10-27 15:19:48 +01:00
Mike Jolley f3d2b2f7f1 Merge pull request #17071 from woocommerce/add/formatting-unit-tests 
Formatting functions tests
 2017-10-27 15:14:14 +01:00
Job 7d6c9e15de Dummy data (#16483) 
* Dummy data

Address #15723 - still needs testing

* Updated ; to , in the CSV file

Updated as per @claudiosanches’ suggestion:
https://github.com/woocommerce/woocommerce/pull/16483#issuecomment-32313
3846

* update after testing

Deleted IDs because those kept causing conflicts

* updated with the new images

updated with the new images

* Updated xml file

Updated XML file:

* Deleted all unnecessary things
* All new product files
* Also images for categories added
* Renamed file

* file name change

consistent with tax dummy data - updated to “dummy-products” for the
xml file
 2017-10-27 15:06:45 +01:00
Mike Jolley 5824cb9358 Update stripe wording 
Closes #16385
 2017-10-27 13:48:48 +01:00
Mike Jolley 4e4ca2145f Remove logging 2017-10-27 13:30:55 +01:00
Mike Jolley 538bbac3ec Handle defaults + locale without clearing defaults 
Rather than loop defaults, then loop locale fields, this merges both
and applies rules after this.

To test, switch countries on the checkout and ensure fields are marked
required/hidden/labelled correctly.

Closes #17353
 2017-10-27 13:29:23 +01:00
Gerhard Potgieter 1e66cedaf0 Save order items before adding new one when there are unsaved changes. Closes #17384 (#17402) 2017-10-27 12:38:10 +01:00
Gerhard Potgieter f0b240d33a Merge pull request #17399 from woocommerce/fix/17306 
Escape attribute name commas in CSV exporter
 2017-10-27 10:59:09 +02:00
Claudio Sanches 2d08ea7d15 Merge pull request #17400 from woocommerce/fix/17377 
Clear counts cache when updating product attributes
 2017-10-26 20:59:09 -02:00
Mike Jolley 08c4953b61 Clear counts cache when updating product attributes 
Closes #17377
 2017-10-26 20:16:52 +01:00
claudiulodro 981b2bc445 Escape attribute name commas in CSV exporter 2017-10-26 09:40:35 -07:00
Gerhard Potgieter a3ec0bf85a Merge pull request #17396 from woocommerce/fix/17379 
Prevent cookie header sent error, and improve error message wording
 2017-10-26 17:03:17 +02:00
Claudiu Lodromanean 3aa43ed5d2 Calculate shipping after discounts (#17364) 
* Calculate shipping after discounts

* Calculate grand total after shipping is calculated

* Keep fees calculation before shipping
 2017-10-26 15:27:10 +01:00
Mike Jolley fb5e5209e3 Prevent cookie header sent error, and improve error message wording 
Closes #17379

To test, reset your password via email.

Then click the reset link in the email again.
 2017-10-26 15:22:25 +01:00
Claudio Sanches 1416ad3983 Merge pull request #17395 from woocommerce/fix/17362 
Wrap table in div with margin
 2017-10-26 12:05:45 -02:00
Mike Jolley 9d7960a6ce Wrap table in div with margin 
Closes #17362
 2017-10-26 14:52:40 +01:00
Mike Jolley 87c6ca5ae0 Merge pull request #17368 from james-allan/fix_thirdparty_coupon_calculations 
Fix coupon discount calculations for third party coupon types
 2017-10-26 14:23:31 +01:00
Claudio Sanches 787bb7f0c0 Fixed permalink default values (#17385) 
* Fixed permalink default values

`woocommerce_permalinks` may return a list with empty results like:

wp> get_option( 'woocommerce_permalinks', array() )
=> array(5) {
  ["product_base"]=>
    string(8) "/product"
  ["category_base"]=>
    string(16) ""
  ["tag_base"]=>
    string(11) ""
  ["attribute_base"]=>
    string(0) ""
  ["use_verbose_page_rules"]=>
    bool(false)
}

This override all placeholders declared with `wp_parse_args()`.

`wp_parse_args()` can apply default values only when missing, and not empty.

This PR removes all empty values in order to use the placeholders.

Fixes a bug introduced in #17352

* Moved array_filter() before wp_parse_args()
 2017-10-26 13:57:40 +01:00
Marcin Bot 234d9e05a5 Fixed the jetpack redirect url for sites in subdirectories (#17312) 
* Fixed the jetpack redirect url for sites in subdirectories

* Using admin_url instead of get_admin_url for consistency

* Wrapped the generated url in esc_url_raw
 2017-10-26 13:40:54 +01:00
Paul Dechov 9c2df6486c Default currency responds to country selection in setup wizard (#17318) 
* Default currency responds to country selection in wizard

* Refactor to use wp_list_pluck

* Use <script> tag to define global instead of using hidden <input>

* Revert ignoring currency option value on page load
 2017-10-26 13:39:54 +01:00
Mike Jolley 8590cd297c Merge pull request #17383 from woocommerce/fix/17332 
[REST API] Fix category "image" returned type when is empty
 2017-10-26 13:01:50 +01:00
Mike Jolley 82c5edc7aa Merge pull request #17389 from woocommerce/fix/importer-placeholders 
Fixed how apply strtolower in columns names in the importer auto map
 2017-10-26 12:56:31 +01:00
Claudio Sanches 6782cfaca5 Fixed how apply strtolower in columns names in the importer auto map 
Now apply for all columns names, even when added by the filters.
 2017-10-26 08:20:06 -02:00
Claudio Sanches 3b6361b28f Merge pull request #17316 from woocommerce/fix/17300-search-orderby 
Pass relevance as default orderby when searching.
 2017-10-25 20:53:49 -02:00
Claudio Sanches d23448a823 Merge branch 'master' into fix/17300-search-orderby 2017-10-25 20:53:25 -02:00