Commit Graph

703 Commits

Author SHA1 Message Date
Mike Jolley 4b315dd7ff Prevent ms-files.php accessing protected downloads when multisite is enabled 2012-03-13 17:00:19 +00:00
Mike Jolley af2aa81eb8 variation menu_order for organisation 2012-03-13 16:59:28 +00:00
Mike Jolley e838a420eb Ajax + Cross seels. TODO: ajax chosen is slightly buggy 2012-03-12 17:26:11 +00:00
Mike Jolley 8914d1856a n/a 2012-03-12 16:14:00 +00:00
Mike Jolley ec83b4d24f Merge pull request #790 from GeertDD/display_no_tax_row
Force the tax row to show up even if no taxes are applicable
2012-03-12 09:00:52 -07:00
Mike Jolley b2fcbb4717 Tweaks to #788. 2012-03-12 15:48:22 +00:00
Mike Jolley 3ccff6346b Merge pull request #788 from GeertDD/enable_coupons_option
Added option to globally enable/disable the use of coupons
2012-03-12 08:31:54 -07:00
Geert De Deckere 3d52b629c3 Added an option to force the tax row to be visible even if no taxes are applicable. 2012-03-12 13:50:38 +01:00
Geert De Deckere e013a8543a Better wording 2012-03-12 11:04:20 +01:00
Geert De Deckere 0401e79ed4 Added option to globally enable/disable the use of coupons for clients 2012-03-12 10:25:06 +01:00
Mike Jolley 7dbcd75207 Prevent double save 2012-03-12 09:18:10 +00:00
Mike Jolley d4ddd8aec5 My account force ssl 2012-03-12 08:34:49 +00:00
Mike Jolley 7e6b254f32 Merge pull request #765 from foxrunsoftware/master
My Account Force SSL
2012-03-12 01:16:43 -07:00
Mike Jolley 3b74269ed2 Merge pull request #773 from piffpaffpuff/master
menu icons when no manage_woocommerce capability
2012-03-12 00:09:18 -07:00
Mike Jolley 4ed69826d9 Merge pull request #785 from jdiderik/master
more granular rights on dashboard widgets by role
2012-03-11 07:27:29 -07:00
Jeroen Diderik b03ce52ba0 more granular dashboard widgets by role 2012-03-11 15:14:57 +01:00
Mike Jolley df540fb66f reports notice 2012-03-11 14:09:52 +00:00
Mike Jolley 6e50486c20 minor fixes and version bump 2012-03-08 12:57:15 +00:00
Mike Jolley 261015fbad minimum amount for coupons 2012-03-07 21:38:34 +00:00
Mike Jolley 5678286dfa tweaks 2012-03-07 20:12:19 +00:00
Triggvy Gunderson 512b6538be menu icons for shop_manager when no manage_woocommerce capability
when the user has no manage_woocommerce capabilities the menu items
(like order) aren't grouped under woocommerce menu. then they showed
the default post it icon. while fixing this i discovered that it uses
the menu icons the old fashioned way instead of css sprites. fixed that
too. but the new icons are just placeholder, someone with the original
art files need to export the png again.
2012-03-07 12:59:23 +01:00
Mike Jolley 9d821d7f52 Category inclusion/exclusion for coupons 2012-03-06 17:28:09 +00:00
Mike Jolley 32e7140517 Improved coupon product id input. Closes #157. 2012-03-06 17:28:08 +00:00
Justin Stern e532c7fbed Force SSL on My Account
The force SSL option forces the My Account pages to be served over
HTTPS, and the unforce SSL option is also modified to allow the My
Account pages to be protected
2012-03-05 22:06:01 -05:00
Mike Jolley 972b375c09 Fix taxonomies page. Closes #743. 2012-03-05 21:23:26 +00:00
Mike Jolley 5091b20844 Inline validation. Closes #733. 2012-03-05 17:19:06 +00:00
Mike Jolley 653f28c79e translation 2012-03-05 16:42:51 +00:00
Andor Chen 86691d3f28 Add Chinese Yuan currency 2012-03-05 23:11:49 +08:00
Mike Jolley 292ba4a70c Translatable numbers. Closes #752. 2012-03-05 10:15:19 +00:00
Mike Jolley d557f5e1dd Localisation. Closes #749. 2012-03-05 10:04:23 +00:00
Patrick Garman f9b8e08eef Little bit of cleanup... 2012-03-04 18:45:27 -06:00
Patrick Garman a5c58d5162 Hidden input fields are sometimes useful, left class/id... maybe someone would use those in some JS? 2012-03-04 18:35:50 -06:00
Patrick Garman fff9ee51b5 Updating to 1.5 2012-03-04 18:31:50 -06:00
Patrick Garman e998a8e6bb Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	assets/css/admin.css
2012-03-04 18:30:16 -06:00
Mike Jolley 9d99197f2f Fixed for months in dashboard widget. Closes #745. 2012-03-03 19:50:43 +00:00
Mike Jolley 43c4f20510 correct address check 2012-03-01 14:11:16 +00:00
Mike Jolley b978c16444 bought back activation css 2012-03-01 00:02:17 +00:00
Mike Jolley f74833d414 Description change 2012-02-29 22:27:12 +00:00
Mike Jolley bd82c9b8be Minor fixes and update variation message 2012-02-29 22:13:27 +00:00
Mike Jolley 064685064e Fixed order tax saving and dupe key generation 2012-02-29 21:05:55 +00:00
Mike Jolley 28fec79647 Show relevant terms in drop down layered nav. reflects list mode. 2012-02-29 15:11:04 +00:00
Mike Jolley a221864c71 Merge pull request #715 from GeertDD/placeholder_context
Added "placeholder" context to translations used as placeholder text in forms
2012-02-28 05:58:08 -08:00
Geert De Deckere d3fcf495a8 Added "placeholder" context to translations used for placeholder text in forms.
This gives translators more accuracy for translations since often the label and placeholder are the same or very similar.
2012-02-28 11:32:06 +01:00
Mike Jolley a2714544a4 cart limit item. Closes #646. 2012-02-27 18:22:54 +00:00
Mike Jolley a81a9bfcb5 Purchase notes - add text to a product to include in order tables after payment 2012-02-27 17:05:26 +00:00
Mike Jolley a3772cd463 Dropdowns for country in order admin 2012-02-26 16:31:58 +00:00
Mike Jolley 5a56380696 email_order_items_table image thumbnails + post updated message 2012-02-26 14:45:56 +00:00
Mike Jolley 6085ae4377 Tweaks and fixes to sale logic + sync function #703 2012-02-26 14:11:56 +00:00
Mike Jolley 9b349a3b91 Merge pull request #703 from pixeltrix/add-variation-sale-pricing
Add previous price to on-sale variable product
2012-02-26 04:47:36 -08:00
Mike Jolley 8560542fa4 simplified external button code 2012-02-26 11:47:49 +00:00
Mike Jolley 130d54779f options 2012-02-26 01:13:03 +00:00
Mike Jolley 74f2e5966d no autosave for orders 2012-02-26 01:05:42 +00:00
Mike Jolley 38cac1324d strong > span 2012-02-26 00:57:05 +00:00
Mike Jolley d2f8602e50 Small markup change 2012-02-25 21:21:21 +00:00
Mike Jolley eddb2d320b Merge pull request #704 from Mamaduka/master
Separated Right Now dashboard widget.
2012-02-25 13:12:50 -08:00
Mike Jolley 95fe36cd07 Save permissions + revoke access after xx days feature. 2012-02-25 21:11:06 +00:00
Mike Jolley eaef280e75 P Permissions. Add/revoke
Still working on this feature
2012-02-25 19:48:09 +00:00
George Mamadashvili 45e881b2a1 Separate dashboard right now widget 2012-02-25 19:17:11 +04:00
Mike Jolley 013797d5e3 Made meta tables consistant 2012-02-25 11:43:25 +00:00
Andrew White 5a0f410aa6 Add previous price to on-sale variable product 2012-02-25 08:03:00 +00:00
Mike Jolley bc854ca3e8 mmm 2012-02-24 22:12:25 +00:00
Mike Jolley 9554a4c52c Admin tweaks and mixed cart handling. Closes #651. 2012-02-24 20:04:05 +00:00
Mike Jolley fdb1359d19 Function for getting placeholder.png - woocommerce_placeholder_img_src() with filter woocommerce_placeholder_img_src 2012-02-24 16:23:08 +00:00
Mike Jolley f0d4d8cb63 Product option for customise the button text for external products 2012-02-24 16:05:17 +00:00
Mike Jolley 16cfdbd345 No need for prefix 2012-02-24 14:58:02 +00:00
Mike Jolley a86d648367 Fix order dates and track order page 2012-02-24 14:33:02 +00:00
Mike Jolley a281816807 Merge pull request #686 from piffpaffpuff/master
updated attributes screen and new hooks in cart template
2012-02-23 01:47:35 -08:00
Triggvy Gunderson 06b7fccaa4 the attribute edit screen now looks like a wordpress edit screen (table tags) 2012-02-22 10:22:31 +01:00
Triggvy Gunderson 903ca749d4 name and slug woding modification
- name and slug are now named like in the rest of wordpress
- in the attributes table the label and slug column were inverted. now
they are arranged like in the rest of wordpress.
2012-02-21 22:20:33 +01:00
Mike Jolley 178a07584f typo 2012-02-21 20:49:58 +00:00
Mike Jolley f5629f21d4 delete_term fix 2012-02-21 16:59:30 +00:00
Mike Jolley b842672e03 comments link 2012-02-21 13:12:57 +00:00
Mike Jolley fd459d702a Order admin. Closes #680. 2012-02-21 12:53:36 +00:00
Mike Jolley 2ea44118ee SKU sorting in admin 2012-02-21 11:07:59 +00:00
Mike Jolley 429e7ea1f3 bulk edit 2012-02-20 18:19:27 +00:00
Mike Jolley 5c9fb30f28 QE tweak 2012-02-20 15:12:19 +00:00
Mike Jolley b096852e1b removed. We need to load post types earlier for ajax. 2012-02-20 14:30:06 +00:00
Mike Jolley 565987dd56 Quick edit Closes #258. 2012-02-20 14:29:51 +00:00
Mike Jolley ab6a05e7f9 not needed 2012-02-18 14:18:36 +00:00
Mike Jolley d14fccf694 Moved notice inline 2012-02-18 10:19:07 +00:00
Mike Jolley 4925069006 Notice when the configuration may cause permalink errors 2012-02-17 23:47:45 +00:00
Mike Jolley a533953779 Activation rule flushes - seems to be reliable. Needs testing on other environments. 2012-02-17 21:25:06 +00:00
Mike Jolley afd0819f5a Fix for reducing/increasing stock notifications. Closes #665 2012-02-17 19:38:45 +00:00
Mike Jolley bfdf71fd26 Some install tweaks 2012-02-17 12:49:32 +00:00
Mike Jolley d3737c39f1 version 2012-02-16 15:54:01 +00:00
Mike Jolley bf13ba4a8b Install message 2012-02-15 23:45:55 +00:00
Geert De Deckere 0019f2f15e Follow-up to d559c5cc87. This function got deleted. 2012-02-15 21:52:23 +01:00
Mike Jolley fee63d1522 Expand/Close 2012-02-15 20:18:01 +00:00
Mike Jolley 6fac70966d Fix dummy data and import process. Closes #639. 2012-02-15 18:30:08 +00:00
Mike Jolley 162722ba84 open error suppression Closes #641. 2012-02-15 17:50:02 +00:00
Mike Jolley d559c5cc87 Friendlier installer 2012-02-15 17:31:44 +00:00
Mike Jolley ced19c9421 esc html sku 2012-02-15 13:25:57 +00:00
Mike Jolley 5139fa0920 Attributes panel 2012-02-13 19:21:52 +00:00
Mike Jolley 81c0a0eeaa variations panel cleanup 2012-02-13 15:08:54 +00:00
Mike Jolley 57f5dc3296 Product page (admin) 2012-02-13 13:06:56 +00:00
Mike Jolley 4a638b962c SKU tweakage 2012-02-13 00:34:09 +00:00
Geert De Deckere 3bae87e394 Made confirmation for removing an attribute translatable 2012-02-12 17:29:32 +01:00
Mike Jolley 576ec9e42d Front page look fixes 2012-02-10 22:15:29 +00:00
Mike Jolley 473a112c66 Fix for variation shipping class detection 2012-02-10 12:16:21 +00:00
Mike Jolley c484f2ff41 notice 2012-02-09 18:10:31 +00:00
Andrew White 7d03784e60 Redirect when there is a single search result 2012-02-09 15:02:55 +00:00
Mike Jolley 44794833f6 Goodbye to free Closes #602. 2012-02-09 09:45:11 +00:00
Geert De Deckere 3b66db369d Fixed the default selected reports tab 2012-02-09 10:01:38 +01:00
Mike Jolley 4de5d1673a Merge pull request #598 from GeertDD/bug_standard_value_textarea
Fixed bug that showed the standard value for empty textareas
2012-02-08 06:40:05 -08:00
Mike Jolley a562132458 Shipping classes for variations. Closes #553. 2012-02-08 14:39:31 +00:00
Geert De Deckere bc09ce17fa Fixed bug that showed the standard value for empty textareas 2012-02-08 15:09:18 +01:00
Mike Jolley bd9deab54b Merge pull request #592 from GeertDD/weight_dimension_units
Added extra weight andimension units to choose from
2012-02-07 09:28:46 -08:00
Mike Jolley 9d31b84ce5 Merge pull request #589 from GeertDD/dev
Small usability tweak for adding product attributes
2012-02-07 09:23:42 -08:00
Mike Jolley 20402857bf Merge pull request #590 from GeertDD/bug_standard_value_textarea
Bug standard value textarea
2012-02-07 09:23:28 -08:00
Geert De Deckere 5bb1f653c4 Oops, fixed array syntax 2012-02-07 15:19:55 +01:00
Geert De Deckere 851197f9e1 Added extra weight andimension units to choose from 2012-02-07 15:14:19 +01:00
Geert De Deckere 0962a268e1 Elements in select lists should not have ucfirst applied 2012-02-07 15:09:29 +01:00
Geert De Deckere b8fd94c7af Revert "Fixed bug that showed the standard value for empty textareas"
Moving it to a separate branch.

This reverts commit dbe0162aed.
2012-02-07 14:17:22 +01:00
Geert De Deckere dbe0162aed Fixed bug that showed the standard value for empty textareas 2012-02-07 14:12:58 +01:00
Mike Jolley 513e207e75 Cleanup to download functionality added by patrick 2012-02-06 17:39:18 +00:00
Mike Jolley 4fe038d48e Merge pull request #547 from patrickgarman/master
Force user login to download files
2012-02-06 09:33:22 -08:00
Mike Jolley 97e89891c2 ShareDaddy. Closes #426. 2012-02-06 17:28:27 +00:00
Mike Jolley 706d15db2d Attribute slug based on label. Closes #570. 2012-02-05 14:07:34 +00:00
Patrick Garman d0d1cdc24d http://www.woothemes.com/2012/02/woocommerce-1-4-is-released/#comment-100907 2012-02-03 04:10:05 +00:00
Patrick Garman a9f92e69b5 Merge branch 'master' of https://github.com/woothemes/woocommerce 2012-02-03 00:53:31 +00:00
George Mamadashvili 6570a7ced6 Add text if there are no product orders 2012-02-02 17:29:42 +04:00
Julian Jöris 4061a625d9 Merge remote-tracking branch 'upstream/master' 2012-02-02 11:23:31 +01:00
Mike Jolley 1036647618 Order time 2012-02-02 01:14:38 +00:00
Mike Jolley f6c71c23f4 Small fixes for 1.4 2012-02-01 21:49:08 +00:00
Julian Jöris daaa7e14c9 Merge remote-tracking branch 'upstream/master' 2012-02-01 12:09:39 +01:00
Julian Jöris 4cef2251ef translation issues 2012-02-01 12:06:08 +01:00
Mike Jolley 20747c192d Hide message 2012-01-31 23:18:40 +00:00
Mike Jolley ce84132713 Minor fixes and comments 2012-01-30 19:24:52 +00:00
Mike Jolley c89c8c11e0 Reports fix 2012-01-30 14:01:51 +00:00
Patrick Garman 6bdec72167 woocommerce_wp_checkbox was setting value to "on" not "yes" by default 2012-01-30 10:30:29 +00:00
Patrick Garman 1c139f3e5e Merge branch 'master' of https://github.com/woothemes/woocommerce 2012-01-29 22:19:26 +00:00
Mike Jolley 35fadb00fe More consistent template file naming, broken checkout into templates 2012-01-29 13:36:33 +00:00
Mike Jolley 95c8669431 SKU exists check 2012-01-29 12:04:55 +00:00
Patrick Garman cfa3a264c7 Merge branch 'master' of https://github.com/woothemes/woocommerce 2012-01-29 02:27:57 +00:00
Patrick Garman 03a6defba5 option to force login to download files 2012-01-29 02:27:49 +00:00
Mike Jolley 4df185c953 Stock qty 2012-01-28 18:53:06 +00:00
lucasstark b8b8bbf77f Update admin/post-types/writepanels/writepanel-product-type-variable.php 2012-01-28 12:11:25 -05:00
Mike Jolley 0ba78556f4 get_sku 2012-01-28 15:37:13 +00:00
Mike Jolley 0226faa96b incl. to checkout too 2012-01-28 15:34:21 +00:00
Mike Jolley f8ea5ed281 Regex trim zeros back 2012-01-28 15:20:49 +00:00
Mike Jolley c57ab7c33f Product page tidy + success icons 2012-01-28 15:20:49 +00:00
Mike Jolley 5ef054f1f8 Product admin tweaks 2012-01-27 20:21:36 +00:00
Mike Jolley 0836ce04db Better class names (final) 2012-01-27 16:38:39 +00:00
Mike Jolley 9cf0d02a4d Allow draft parents. Closes #540. 2012-01-27 15:19:09 +00:00
Mike Jolley 89a226a895 Store cart + shipping tax rows instead of a combination 2012-01-27 15:00:03 +00:00
Mike Jolley e8ef14ce7d Stock fix, and send shipping to paypal 2012-01-25 21:52:12 +00:00
Mike Jolley 0afe34a222 Minor fixes 2012-01-24 16:56:37 +00:00
Geert De Deckere 7b943ecfb8 Merge branch 'master' of git://github.com/woothemes/woocommerce
Conflicts:
	woocommerce-ajax.php
2012-01-22 10:18:00 +01:00
Mike Jolley e71d1b8034 Changed order item rows - see extended desc
Changed rows so we no longer store unit price. There were too many
rounding issues with inc. tax prices with the previous method. Now we
simply store line price - a subtotal which is before discounts, and a
total which is after discounts.
2012-01-22 02:39:21 +00:00
Mike Jolley a40e5f2bb7 Calculation prompt strings 2012-01-22 02:37:11 +00:00
Geert De Deckere 7706ecfe7b Starting class names with a capital. Closes #519. 2012-01-21 10:07:54 +01:00
Mike Jolley 57e233adb1 Switched to .com maps. Closes #515. 2012-01-21 01:18:49 +00:00
Mike Jolley 0ef27c9fb7 fix for recent orders widget 2012-01-19 21:45:57 +00:00
Mike Jolley 0ab045e16b Fixed admin ajax 2012-01-18 17:49:55 +00:00
Mike Jolley 197b629307 Chart/report fixes 2012-01-18 16:54:05 +00:00
Mike Jolley c407d60d85 Notice text tweak 2012-01-18 12:29:13 +00:00
Mike Jolley 3802145b96 Notice 2012-01-18 12:26:31 +00:00
Mike Jolley b3665c35b2 Added help tabs to main WC admin pages 2012-01-18 11:53:34 +00:00
Mike Jolley aa4b074ca3 Rounding and calc totals 2012-01-14 01:23:16 +00:00
Mike Jolley cd8b0fd492 Order calculations 2012-01-13 21:25:39 +00:00
Mike Jolley 23a3776f04 Tweaks to order/validation class to improve performance 2012-01-13 00:46:56 +00:00
John-Henrique f2d75bdbbc added support the translation product list (select type) 2012-01-12 13:51:53 -03:00
John-Henrique 0d49d6e5a5 Added translation support to product list #494 2012-01-12 09:58:55 -03:00
Mike Jolley 8996b8f31a Tweaks to variations. 2012-01-12 11:09:54 +00:00
Mike Jolley a2d51aa201 Github sabotages files -.- 2012-01-12 00:54:45 +00:00
Mike Jolley 1dc5a3bc0b Revert 136456f805ccdf9b7b6bce027dc24da3c14d4281^..HEAD 2012-01-12 00:43:30 +00:00
Mike Jolley 136456f805 Remonde ob_start. Moved checkout processing to init hook. Fixed email bug. 2012-01-12 00:30:21 +00:00
Mike Jolley f8b3b65ada Fixed duplicate product functionality 2012-01-11 19:37:33 +00:00
Mike Jolley 645d59f51b Tabs 2012-01-11 18:59:30 +00:00
Mike Jolley bc91c1433b Goodbye &new. Closes #475. 2012-01-10 15:11:06 +00:00
Mike Jolley 55222422c6 Option to hide tax on cart page. Closes #469. 2012-01-09 18:00:52 +00:00
Mike Jolley 86afeaf594 Show order backend fields. Closes #460. 2012-01-09 15:42:37 +00:00
Mike Jolley cf1e36c347 Roles + caps for various post types and pages. Closes #457. 2012-01-09 13:14:48 +00:00
Mike Jolley aba310f321 WPML filters #244 2012-01-06 17:14:31 +00:00
Mike Jolley 13cd6952c7 Gallery meta fix. Closes #296. 2012-01-06 16:10:12 +00:00
Mike Jolley df1170a716 Delete all variations. Closes #243. 2012-01-06 15:57:24 +00:00
Mike Jolley 86f6d68bbe Save customer meta. Closes #458. 2012-01-06 14:43:03 +00:00
Mike Jolley aa89763adb Default shipping. Closes #461. 2012-01-06 14:28:08 +00:00
Mike Jolley 28dbaa63e7 Dashboard localisation Closes #443. 2012-01-05 16:20:13 +00:00
Mike Jolley 49a159a81f Added missing option back. Closes #448. 2012-01-05 15:49:28 +00:00
Mike Jolley 250d2f5cd6 Cleaned up some localisation's. Closes #438.
Let me know if there are any more.
2012-01-05 12:29:52 +00:00
Mike Jolley f74e041a30 Renamed textdomain Closes #444. 2012-01-05 11:31:22 +00:00
Mike Jolley 840e41c3e4 Missing localisation. Closes #445. 2012-01-05 10:45:01 +00:00
Mike Jolley a3f633e3a3 Fixes, subtotals, some backwards compat 2012-01-04 23:01:47 +00:00
Mike Jolley fb5bb626e8 Shipping tax calc + rows, fixed up write panel 2012-01-04 16:24:26 +00:00
Mike Jolley 28922bb4ef Shipping method tweaks/api to add multiple rates easily. 2012-01-03 19:07:32 +00:00
Mike Jolley ca0e9744ab Local tax rates - zips and zip ranges 2012-01-03 17:23:42 +00:00
Mike Jolley d9df9e7f73 woocommerce_product_visibility_options filter 2012-01-03 12:31:25 +00:00
Mike Jolley 701938961c Stock quantity 2012-01-03 10:35:59 +00:00
Mike Jolley c2e68c4538 Attribute esc_html 2012-01-03 10:22:17 +00:00
Mike Jolley cd9aaa7f6f Local tax rate interface 2012-01-03 10:01:19 +00:00
Mike Jolley 8733821091 Email totals, interface for local tax rates 2012-01-02 17:45:26 +00:00
Mike Jolley cc7e560a14 Bug fixes 2012-01-02 12:48:56 +00:00
Mike Jolley ec7135ebb4 Taxes rounding + shipping, started email totals 2012-01-02 00:49:00 +00:00
Mike Jolley bd4eaa9eb1 Tax rows and add order line item ajax 2011-12-31 19:03:41 +00:00
Mike Jolley 1de85e5d19 More taxes + totals work. Line item tweaks.
Next step; shipping.
2011-12-30 14:00:41 +00:00
Mike Jolley 90a257b4fa Tax rows and compound taxes on cart page 2011-12-28 23:59:33 +00:00
Mike Jolley a125a186de Save tax class + status 2011-12-28 13:04:37 +00:00
Mike Jolley 86233f09ba Changed order item rows (stored)
Instead of storing price ex. vat, we use the catalog settings. This
eliminates rounding errors and needing to store totals to high
precision.

Also, now storing tax class/status, line cost, and line tax. This will
allow us to support compound and stacked taxes (which are too complex
to do by storing just tax rate alone).

Old orders data will be missing for line item costs, but order totals
will be unaffected. This is unavoidable.
2011-12-28 13:02:13 +00:00
Mike Jolley 582e909f89 Keys 2011-12-24 17:16:10 +00:00