Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,949 Commits 1,103 Branches 783 Tags 949 MiB
Commit Graph

26949 Commits

Author SHA1 Message Date
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
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
GlennMartin1 256a4d96e2
grammar fix... 2018-04-18 09:11:32 -04:00
Mike Jolley fc8e7be3ab Only show notices on specific screens 2018-04-18 14:08:31 +01:00
Mike Jolley e201b74832
Merge pull request #19756 from woocommerce/feature/19735 
Notice about HTTPS as a requirement
 2018-04-18 13:53:54 +01:00
Mike Jolley 5455e7049b Update notice text 2018-04-18 13:52:59 +01:00
Mike Jolley 29961b540a Fix up query 2018-04-18 12:04:53 +01:00
Mike Jolley 248ad8f860 Add anonymized meta to order 2018-04-18 11:35:42 +01:00
Mike Jolley 30ba25d535 Remove defaults 2018-04-18 11:24:07 +01:00
Mike Jolley fdf086cbfc move jquery-ui 2018-04-18 11:22:01 +01:00
Mike Jolley 9dfb91835e Merge branch 'master' into update/gdpr-order-cleanup 2018-04-18 11:21:43 +01:00
Mike Jolley 8a05930cba
Merge pull request #19761 from woocommerce/update/obw-save-locales-measurement-units-when-saving-address 
OBW: Save locale-specific measurement units upon saving address
 2018-04-18 11:09:48 +01:00
Mike Jolley 97e747e745 Add default text prop 2018-04-18 11:05:36 +01:00
Mike Jolley b05ac76303
Merge pull request #19762 from woocommerce/update/obw-store-state-control-in-store-setup-form-layout 
OBW: Position State select between City and Zip inputs
 2018-04-18 11:04:41 +01:00
Mike Jolley 0b3b3934ba
Merge pull request #19768 from woocommerce/fix/19755-fix-download-log-unit-test 
Fix download log unit test
 2018-04-18 11:02:06 +01:00
Mike Jolley 62a5e8e7bf
Merge pull request #19760 from woocommerce/fix/scss 
Fix scss indenting in wc-setup.scss
 2018-04-18 10:59:27 +01:00
Gerhard Potgieter 0a369e2ac8
Merge pull request #19758 from woocommerce/add/obw-payfast-payment-gateway 
OBW: Show PayFast payment gateway to merchants in South Africa.
 2018-04-18 11:07:17 +02:00
Peter Fabian b770e0baed Used the selected function to take care of markup and simple case. 2018-04-18 09:57:19 +02:00
Gerhard Potgieter f0f6169145 Fix the download log unit test, with the new constraint key introduced in #19330 the download log needs a valid download to save correctly. 2018-04-18 09:43:24 +02:00
Paul Dechov c1211e5f03 OBW: Move store State dropdown between City and Zip 2018-04-17 23:16:59 -04:00
Paul Dechov 8c8e18d25b OBW: Save locale-specific measurement units upon saving address 2018-04-17 22:52:42 -04:00
Jeff Stieler e2d6656124 OBW: show PayFast payment gateway to merchants in South Africa. 2018-04-17 17:45:43 -06:00
Claudiu Lodromanean 59d967c859
Merge pull request #19754 from woocommerce/add/obw-eway-payment-gateway 
OBW: Show eWAY payment gateway to merchants in AUS/NZ.
 2018-04-17 16:33:41 -07:00
Claudiu Lodromanean 4da2a2e2fe
Merge pull request #19759 from woocommerce/fix/obw-mailchimp-redirect 
OBW: Prevent MailChimp from redirecting after activation.
 2018-04-17 16:25:24 -07:00
claudiulodro c66b518c61 Remove duplicate css 2018-04-17 16:18:39 -07:00
Jeff Stieler 098115006e OBW: prevent MailChimp from redirecting after activation. 2018-04-17 17:15:14 -06:00
claudiulodro 7c5d026661 Reapply payment settings css 2018-04-17 16:12:53 -07:00
claudiulodro 6b2174b06b Fix indenting and reapply changes 2018-04-17 16:01:19 -07:00