Commit Graph

27842 Commits

Author SHA1 Message Date
Mike Jolley fe30b4900e
Merge pull request #19798 from tivnet/patch-6
Update wc-template-functions.php
2018-04-20 11:37:39 +01:00
Mike Jolley 90083782c0
Merge pull request #19799 from tivnet/patch-7
Update wc-template-functions.php
2018-04-20 11:37:14 +01:00
Gregory Karpinsky 88b9f3763e
Update wc-template-functions.php
`wc_privacy_policy_page_id()` has no parameters.
2018-04-19 21:35:02 -04:00
Gregory Karpinsky 02a4538c82
Update wc-template-functions.php
Spelling
2018-04-19 21:19:36 -04:00
Khan M Rashedun-Naby b6cfc6f291 Removed unnecessary else condition. 2018-04-20 01:06:25 +06:00
Mike Jolley 8aa214bab5 Better callback 2018-04-19 18:37:07 +01:00
Mike Jolley cd20ba0666 Add notices to wrapper div in cart 2018-04-19 18:27:46 +01:00
Mike Jolley bd539e38f0 Remove output buffering 2018-04-19 18:27:29 +01:00
Mike Jolley b28b611bb6 Hook notices into WC areas and support returning notices 2018-04-19 18:26:52 +01:00
Mike Jolley efe06cb147 Remove direct calls to wc_print_notices 2018-04-19 18:26:21 +01:00
Khan M Rashedun-Naby 1b7e14a4b6 Spelling fix 2018-04-19 21:10:36 +06:00
Mike Jolley 1d0528b73f
Merge pull request #19778 from woocommerce/fix/inline-docs-admin-attributes
Fixed admin attributes page inline docs
2018-04-19 10:48:36 +01:00
Mike Jolley 5fbd04ec63
Merge pull request #19779 from garrett-eclipse/patch-1
Spelling fix - disappearing
2018-04-19 10:48:15 +01:00
Mike Jolley bdf5dbec6a
Merge pull request #19782 from rnaby/removed-unnecessary-else-condition
Removed unnecessary else condition check.
2018-04-19 10:47:53 +01:00
Mike Jolley f0d53ae4b5
Merge pull request #19784 from michaeltieso/patch-2
Typo
2018-04-19 10:47:18 +01:00
Mike Jolley ce91bb3809
Merge pull request #19781 from woocommerce/feature/pr-template
Introduced Pull Request template
2018-04-19 10:45:55 +01:00
Mike Jolley 33c75fb1c2 Wording tweaks and removed the type of change section 2018-04-19 10:45:03 +01:00
Michael Tieso f7ef8a5611
Typo
Introducing the most epic PR. You're welcome :)
2018-04-19 11:44:20 +02:00
Khan M Rashedun-Naby 9aed8394cb Removed unnecessary else condition check. I think in this situation after early returning the else is redundant. 2018-04-19 11:04:44 +06:00
Claudio Sanches 55eee758d7 Prerequisites description 2018-04-18 19:24:14 -03:00
Claudio Sanches 8c52a6ab48 Introduced Pull Request template 2018-04-18 19:20:20 -03:00
Garrett Hyder 4b95b6fdd6
Spelling fix - disappearing 2018-04-18 13:04:50 -07:00
Claudio Sanches 00bc21135c Fixed admin attributes page inline docs 2018-04-18 15:32:46 -03:00
claudiulodro 4f84364631 Recompile everything 2018-04-18 10:04:02 -07:00
claudiulodro 75bb4095ef Bump version for 3.4 beta 1 2018-04-18 10:02:53 -07:00
Claudiu Lodromanean fb50c84866
Merge pull request #19775 from woocommerce/update/3.4-readme
Rolling 3.4 Readme
2018-04-18 10:00:04 -07:00
Claudiu Lodromanean 60a17d74e6
Add #19743 to changelog 2018-04-18 09:52:44 -07:00
Claudiu Lodromanean 26fb91dc61
Merge pull request #19743 from woocommerce/update/gdpr-order-cleanup
GDPR: Order cleanup
2018-04-18 09:51:01 -07:00
claudiulodro 3547df00d9 Use min of 1 for number 2018-04-18 09:48:42 -07:00
claudiulodro c15cb09700 Resolve merge conflicts 2018-04-18 09:46:15 -07:00
claudiulodro 754031ce6d Add min to date number 2018-04-18 09:42:32 -07:00
claudiulodro 63972447cb Fix nonexistent function calls 2018-04-18 09:40:23 -07:00
Mike Jolley 05cadde299
Merge pull request #19749 from woocommerce/update/19739
Implement privacy policy content
2018-04-18 17:13:17 +01:00
Mike Jolley b93e00b07a 19749 2018-04-18 17:12:45 +01:00
Mike Jolley 33f4fd7b93 Moved to privacy class and updated dummy content. 2018-04-18 17:10:41 +01:00
Mike Jolley 128c9cb0da Merge branch 'master' into update/19739 2018-04-18 17:02:46 +01:00
Mike Jolley 669d038d24 #19777 2018-04-18 16:55:53 +01:00
Mike Jolley 9a8c47740d
Merge pull request #19777 from bekarice/tweak/filter-used-coupon-url
Filter the used coupon URL in "edit order" screen
2018-04-18 16:55:23 +01:00
Beka Rice 7bd9cdacaa Filter the used coupon URL in 'edit order' screen 2018-04-18 11:49:35 -04:00
Mike Jolley b194450c71 #19772 2018-04-18 16:44:20 +01:00
Claudio Sanches 9679e7be1f
Merge pull request #19772 from woocommerce/update/notice-display
Only show notices on specific screens
2018-04-18 12:23:11 -03:00
Mike Jolley ae446853e8 19747 2018-04-18 15:44:04 +01:00
Mike Jolley 86c427506b 19705 2018-04-18 15:42:35 +01:00
Mike Jolley d381330a91
Merge pull request #19705 from woocommerce/fix/19619
Handling of PHP's automatic array key conversion to int
2018-04-18 15:40:31 +01:00
Claudiu Lodromanean 48eb13d602
Merge pull request #19747 from woocommerce/update/19734
Add privacy policy to account pages
2018-04-18 07:26:06 -07:00
Gerhard Potgieter 3f785d8964 Remove unused variables and merge correct ones. 2018-04-18 16:10:37 +02:00
Gerhard Potgieter a15687470d Move fist and last date into one query 2018-04-18 16:07:54 +02:00
Mike Jolley bd8e942362 Readme for recent PR merges 2018-04-18 15:02:31 +01:00
Peter Fabian 4538f3fa8f Moved wc_selected to core functions. 2018-04-18 15:54:57 +02:00
Mike Jolley 4eaacb41bc
Merge pull request #19773 from GlennMartin1/patch-2
grammar fix on HTTPS notice...
2018-04-18 14:23:13 +01:00