diff --git a/.htaccess b/.htaccess
index 9a2d22dd4f..2ea2a09ca8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -122,6 +122,16 @@
#RewriteBase /magento/
+############################################
+## uncomment next line to enable light API calls processing
+
+# RewriteRule ^api/([a-z][0-9a-z_]+)/?$ api.php?type=$1 [QSA,L]
+
+############################################
+## rewrite API2 calls to api.php (by now it is REST only)
+
+ RewriteRule ^api/rest api.php?type=rest [QSA,L]
+
############################################
## workaround for HTTP authorization
## in CGI environment
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index c9971abea7..b54e748dbc 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,569 @@
+==== 1.7.0.0-rc1 ====
+
+=== Major Highlights ===
+New Layered Navigation price bucket algorithm
+Added captcha functionality
+Implemented different base prices for customer groups
+Added auto generation of coupon codes
+Backup and Rollback functionality
+VAT ID Validation added
+Implemented DHL for Europe
+Added REST API
+
+=== Improvements ===
+XmlConnect package release v22.1
+Upgraded TinyMCE to v3.4.7
+Mobile theme was redesigned
+Added ability to translate action array parameter nodes via layout.xml
+Added support for using custom currency symbols
+Added functionality to cleaning old cache files by cron task
+Refactored rules-based modules
+Improved customer address handling using PayPal Express checkout
+Refactored escaping functionality used with translations
+Added ability to customize logo in emails from the admin
+Implemented front-end cookies restriction functionality
+Added ability to turn off/on IP Tracking (e.g. 'Placed from IP') on the Sales pages in back-end (Order, Invoice, Shipment, Credit memo)
+Provided logic to disable ACL resources through configuration files
+Added additional placeholders for extensions developers
+
+=== Changes ===
+Added "Cache On Delivery" and "Bank Transfer" payment methods
+Support for "memcached" PHP extension was added
+Library js/scriptaculous/dragdrop.js is upgraded to version 1.9.0
+Image file of "jpg" type are allowed for favicon
+Added ability to extend list of attributes to select for categories loaded via Mage_Catalog_Model_Resource_Category_Flat::_loadNodes()
+Added changes to lib/Varien/Http/Adapter/Curl.php to provide interface for setting different cURL options
+Displaying State or Province can be optional for any country
+Added ability to get Magento type from Mage.php
+
+=== Fixes ===
+Fixed Multiple warnings in system.log after running compilation process
+Fixed Session is lost while redirecting from secure to unsecure URL
+Fixed Redirect to base URL should consider full request URI string
+Fixed Product name with <> processed incorrect during creation order in backend
+Fixed FedEx SmartPost method doesn't appears in rate request
+Fixed 3 and 4 digits CVV should be accepted for JCB cards
+Fixed Google Checkout tax isn't applied to Bundle product
+Fixed FPT is not considered by Google Checkout
+Fixed An error occurred during second Customer authorization fail
+Fixed Property declaration typo in Mage_Bundle_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option
+Fixed Product is not shown in the Catalog when it is Out of Stock and Display Out of Stock Products = Yes
+Fixed Impossible download downloadable product (problem with secure link)
+Fixed Wrong letter case in class names may cause malfunction when Compiler is enabled
+Fixed Incorrect invoice amount in order with FPT
+Fixed Attributes not connected to any product of selected category display in layered navigation
+Fixed No feedback on creating attribute set in IE9 and IE8
+Fixed Unexpected breaking import process leads to creation phantom data into database
+Fixed Two of the same FedEx option show instead of one
+Fixed Notification for Google contains link that cover large area and blocked user work
+Fixed Possible to create user role with empty name if it starts with "less than" sign
+Fixed Impossible to use Clear Shopping Cart button in IE7
+Fixed Impossible create product with one FPT price for all State/Province
+Fixed 'Interval Division Limit' affects to global displaying of Layered Navigation
+Fixed Shipping method must be recalculated on Order Review page if Transfer Shipping Options is enabled
+Fixed Issue with different secure/unsecure URL cause session data lost
+Fixed Can't save option Country in Store Information Tab
+Fixed Rule date information has been missed after using Product Rule or Shopping Cart Price Rule
+Fixed Billing/Shipping address algorithm for PayPal Express checkout works incorrect
+Fixed Error during quick search
+Fixed Block "Description" on Catalog Price Rule page has incorrect size
+Fixed Search doesn't work if Maximum Query Length field is empty
+Fixed The Tags Product RSS doesn't update information after changing tag
+Fixed Customer Attributes and Customer Address Attributes validation
+Fixed Issue with final price calculation for Configurable product with sub products
+Fixed Blank page after customer registration with enabled compilation
+Fixed "Place Order" button must be enabled if all required fields passed the validation on PayPal Express Checkout
+Fixed Products quantity displays incorrect in price ranges after import (rounding problem)
+Fixed Layout issue in shopping cart on Frontend (IE8)
+Fixed Impossible to assign user to the role if he is assigned to another role
+Fixed 'Total records found' on Reports -> Tags -> Popular page shows wrong quantity of records
+Fixed Unable to refresh lifetime statistics
+Fixed After changing Price Navigation Step calculation from Automatic in Continuos the category is loaded very slowly
+Fixed No ability to create Shipping Label (in case with USPS First-Class Mail International Parcel method)
+Fixed It is impossible to create Shipping Label for FedEx
+Fixed Redirect Customer to Account Dashboard after Logging is in enabled and doesn't work for Wishlist
+Fixed No ability to edit values using mass actions for product in IE8, IE9
+Fixed Wrong message during checkout process in Inline Translate mode
+Fixed Default country is selected in Shipping Address during Admin order creation
+Fixed The Static block widget doesn't displayed on the Product View Extra hint for bundle product
+Fixed Bunch of W3C validation errors on frontend while using inline translate
+Fixed Product's association to root category is lost after export/import
+Fixed WYSIWYG Editor: Page is scrolled to the top after inserting variables
+Fixed Incorrect Backup/Rollback message
+Fixed FedEx Free shipping doesn't work correctly
+Fixed Configurable product displaying double price when choosing option
+Fixed Impossible to configure Admin User Emails for store view scope
+Fixed Long payment method data is printed improperly in PDF invoice
+Fixed Impossibility of changing the Rating Value title for store view in existing Rating Value with filled the Rating Value title for store view
+Fixed Trademark symbol not showing up
+Fixed Add "Delivery Option" for FedEx Configurations
+Fixed Saving product takes long time
+Fixed Notice message disappear after clearing cache
+Fixed Products qty displays incorrect in price ranges after import (rounding problem)
+Fixed Images in CSS fail when merging CSS files
+Fixed Mass action update of any attributes resets multiselect attributes to NULL
+Fixed Move CSS from Prototype Windows plug-in to the backend skin
+Fixed DB adapter should check transaction level in case of DDL query
+Fixed When Payment method additional info contains double quote it is displayed as '"' in invoice PDF
+Fixed Incorrect Unit Price(Excl. Tax) in the Shopping Cart Grid after changing currency
+Fixed Incorrect total quantity of records and pagination doesn't work on Reports->Reviews->Products Reviews page
+Fixed Incorrect title of All Reviews for product page
+Fixed Invalid message in shopping cart when trying to add products amount more than allowed
+Fixed Layered Navigation: Icon "Previous" should be appear only on sub-intervals level
+Fixed Processing error occurred when big numeric value is entered to an browser URL
+Fixed Issue with credit memo for multiple bundled products (order status is Processing)
+Fixed Customer group has to be emulated even if customer is sticky assigned to the group
+Fixed "Customs Value" isn't represented in store base currency
+Fixed Layered Navigation: After clicking on interval $0.00, should be filtered and displayed products with price 0.00
+Fixed Absence of redirecting to the grid page after saving Role/User
+Fixed Incorrect logic of assignment of unique ID in Varien_Data_Collection
+Fixed Problems with sorting actions
+Fixed When product is unsaleable checkout is still possible depending on its position in cart
+Fixed Impossibility of creating new order with "Reorder" button when Out of stock or disabled products had been ordered
+Fixed "Online Minute Interval" customer configuration option should have global scope
+Fixed Unable to translate Active/Inactive in promotions grid
+Fixed Response headers contains 500 error during front-end pages browsing
+Fixed Add additional button to PayPal Redirect Page
+Fixed Category Permissions: if "Display Product Price" is set to "No" the page toolbar is absent
+Fixed Layered navigation options have wrong order in back-end
+Fixed The "Remember Me" check box with the "What's this?" link should be located below the "Forgot Your Password?" link
+Fixed Warning message is absent, when "Recovery Link Expiration Period" is specified within the correct range
+Fixed PayPal HSS (Website Payment Pro Hosted Solutions) France doesn't work
+Fixed Remove email from Billing address section of the PayPal Express Order Review page
+Fixed It is available enter negative digits in the "Layered Navigation Price Step" (on Category page)
+Fixed First/Last Name algorithm for PayPal Express checkout
+Fixed Asterisk isn't imported in Zip/Post Code field
+Fixed Some strings are not translated in widgets
+Fixed Session isn't stored between secure and usecure URLs when they are located in different paths of the same domain (no SID in request)
+Fixed "USPS First Class International Parcel" will not show up as an option for customers during checkout
+Fixed UPS, FedEx and DHL methods should work if zip code from / to isn't required
+Fixed Issue when trying to create an order from the back-end without selecting the state/province
+Fixed HTTP error when uploading images from a MacOS with shockwave flash 11.1.102.55
+Fixed UPS Configuration "All Methods" should be selected by default
+Fixed Cannot create a product review through back-end
+Fixed Typos in Role Permission tree
+Fixed WYSIWYG button layout issue on product page
+Fixed Require Customer's Billing Address is missing option "For Virtual Quotes Only"
+Fixed Errors appears on Design Configuration page if transactional email's logo image and/or favicon files were deleted
+Fixed State/Province value is reset after page reload on some forms
+Fixed Cannot access back-end after switching on and switching off "Use Custom Admin URL"
+Fixed "Unsubscribe Selected" and "Delete Selected Problems" buttons don't work
+Fixed After selecting shipping from dropdown system doesn't update order data automatically on PayPal Express Order Review page
+Fixed Buttons on the back-end order page don't have titles
+Fixed ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION error in Chrome browser
+Fixed Changes related with Apply and Discount Amount options for sub item, applied after clicking "Save Rule" button
+Fixed Invalid Timezone error for Asia/Calcutta when changing default country to India
+Fixed Sorting by position doesn't work for up-sells and related products
+Fixed Absent validation for "Only X left Threshold" field
+Fixed Shipping method calculation based on default shipping address instead of 'Same as billing' setting in back-end
+Fixed There is no validation of the field "Handling Fee" that allows number less than zero in UPS shipping method
+Fixed Product name with "<>" processed incorrect during creation order in back-end
+Fixed Billing Address Line is always blank if "REQUIREBILLING = 1" for PayPal Express
+Fixed SQL query for getting record count of archived orders takes too long time
+Fixed Configuration->Inventory->Qty Increment isn't validated properly
+Fixed Absent message about not enough quantity for bundle and configurable products
+Fixed Wrong behaviour of split buttons in IE8
+Fixed Warning message appears after unselecting user in the Role Users grid
+Fixed Incorrect total weight calculation in external shipping methods for products with decimal Qty Increments
+Fixed Tax calculation is incorrect if configurable product mixed up with other composite products in the shopping cart for Store Tax != Customer Tax
+Fixed Products qty displays wrong in layered navigation after changing currency
+Fixed Billing address fields are editable if "Same as shipping" selected on the PayPal Express order review page
+Fixed Incorrect location of "Clear All" link
+Fixed Incorrect price for bundle fixed product with custom option % and catalog price rule applied
+Fixed Import/Export: Append Complex Data works incorrect for customer's address and product's customs data
+Fixed Discount changes subtotal when FPT is active
+Fixed There is no ability to specify backup's name
+Fixed Multi selections fields for website scope settings are greyed out
+Fixed "Credit Memos" is written incorrectly in Role Permission tree and on the Sales -> Archive -> Credit Memos page
+Fixed Persistent Shopping Cart: After deleting customers via Back-end, on front-end customer should be logout completely
+Fixed Incorrect logic during dividing products into multiple boxes for shipping
+Fixed Polls are not working properly in case with different domains for http and https
+Fixed "Block Reference" drop-down contains wrong list of options for front-end Apps types with Products
+Fixed "Wrong store specified" appears on order creation page
+Fixed Customer can't continue Checkout process after selecting Billing Address
+Fixed Refresh Statistics gone from Reports Role
+Fixed USPS shipping label is printed with "SAMPLE - DO NOT MAIL" sign
+Fixed Shipping methods are not refreshed after Update Order Data is pressed on PayPal Express Order Review page
+Fixed Product still invisible in front-end after required reindex
+Fixed JS error on configurable products
+Fixed Configurable product missing name in error message when exceeding quantity during order
+Fixed Added Display Product Count on the Layout Navigation
+Fixed "FedEx Priority Overnight" shipping method isn't calculated correctly
+Fixed Incorrect product price for Bundle products with fixed prices in the shopping cart
+Fixed "Ship Bundle Items" for bundle product works incorrect
+Fixed Impossible to expand settings accordions on the "Design Settings Editor" tab of Theme Customization page under IE7
+Fixed Impossibility to configure Bundle product with Disabled status and create new order with it in the back-end
+Fixed Customer email isn't saved in Account Information field
+Fixed Unable to sort products by price
+Fixed Errors during creating/extracting "tar" archive with symbolic links
+Fixed Wrong message text in "Manage Coupon" tab on Shopping Cart Price Rule page
+Fixed 404 page not found error occurs when "Default Store" value is changed for Main Website
+Fixed Unable to import products if Catalog price rule enabled
+Fixed Partial Reindex isn't done for product saved in back-end
+Fixed Catalog Price Rule: "Save and Apply" action leads to apply ALL rules, but it have to apply only specified rule
+Fixed Tax isn't recalculated on PayPal Express
+Fixed Backup Name field should allow to enter only a limited number of characters
+Fixed In the "Subtotal" row of "Coupons Usage Report" displayed amounts for all Shopping Cart Price Rule in the system
+Fixed Shipping address isn't passed to Magento from PayPal
+Fixed Store view isn't changed when customer subscribes for newsletters
+Fixed Shopping Cart Price Rules are not marked after creating Coupons Usage Report
+Fixed Change buttons structure in prototype/windows.js to match general adminhtml buttons structure
+Fixed Wrong error message on Create New Order page in back-end
+Fixed Impossible to configure order of displaying rating values in the front-end
+Fixed Incoming Message in Admin Part has the superfluous symbol '\'
+Fixed Numerous issues with promotions on complex products
+Fixed Recipient Postal-State Mismatch error seen on Shipping Label with FedEx
+Fixed Text messages "This is a required fields." are displayed in the hidden FTP section
+Fixed Incorrect popup on Manage Coupon Codes tab in Shopping Cart Price Rule
+Fixed Layered navigation work incorrect if attribute values defined on Store View level
+Fixed Checking import file returns blank page
+Fixed Change the VAT Number format before sending to VAT ID Validation service
+Fixed Simple products with configured customs options displayed in wishlist incorrectly
+Fixed Incorrect text message for product for which there is no enough quantity in stock
+Fixed Setting float Qty Increments is possible, but doesn't work
+Fixed SQL error during checkout when customers register at checkout and orders a nominal item
+Fixed Iframe for gateway isn't reloaded on the Payment information tab
+Fixed Incorrect behavior after placing order from back-end in FF9
+Fixed Catalog price rule skips conditions specified and applies to all products in the catalog
+Fixed Price rule is applying to individual items in bundle when price is set to Dynamic
+Fixed Impossible to save payment method configurations on the Default Config scope
+Fixed "There has been an error processing your request" message is display if not CSV file was selected to import
+Fixed Wrong reindex product attributes after bundle product save
+Fixed Add Products button absent during creating order from back-end
+Fixed "All methods" should be selected by default in configuration section "Allowed Methods" for UPS
+Fixed Redirect to base URL issue
+Fixed Added Backup sorting by name possibility
+Fixed Fix grammar mistakes
+Fixed Notifications are not shown if URL Rewrite used
+Fixed "Stop Further Rules Processing" option doesn't work
+Fixed Admin can not unassign product from the tag if already approved tag was added to the product by customer
+Fixed Inaccuracy calculation could be 10% for FedEx International Ground shipping
+Fixed Incorrect price calculation of configurable product with custom options (resolved conflicts)
+Fixed Wrong currency displayed in Recently Viewed Product App
+Fixed Tabs are grayed on admin dashboard
+Fixed JS validation for product weight attribute doesn't work
+Fixed Group Price attribute is present as text field using the mass update action
+Fixed Shopping Cart Price Rule isn't applied to Not Logged In Customers
+Fixed "Sign up for our newsletter" text appearing twice
+Fixed Newsletter problem report grid on back-end throws Exception
+Fixed Special price doesn't work for Bundles with Dynamic price
+Fixed My Orders block disappears in My Account pages when Reorder functionality is disabled
+Fixed Search doesn't work in Backups grid
+Fixed Reindex "Catalog URL Rewrites" works extremely slowly
+Fixed Checkbox state is preserved for "Put store on the maintenance mode while rollback processing"
+Fixed UPS Configuration All Methods Should Be Selected by Default
+Fixed Rollback fails if database backup was performed after product import
+Fixed Incorrect behavior with 10-digit Zip code, after creating new Tax Rate
+Fixed Configurable attributes that used for create configurable product should not be applied to that product
+Fixed Default group has to be used if customer selects address without VAT number
+Fixed No ability to create Shopping Cart Price Rule
+Fixed Layout issue appears in IE9 on the export grids
+Fixed Issue when trying to view the order using a specific admin user
+Fixed System messages are not displayed at CMS pages and appears only when another message will be invoked
+Fixed On the front-end Search doesn't work properly if search value is 0 (null)
+Fixed The size of the columns in Backup grid is changed if no records were found
+Fixed Maintenance flag isn't deleted if rollback fails with not enough permissions error
+Fixed Customer's group isn't changed if his billing address modified within back-end
+Added Add a message and the link in the mini shopping cart, when the cart is empty
+Fixed On Edit Shipping Address page button "Validate VAT Number" should be hidden
+Fixed Fatal error when try to ship order with Flat Rate shipping method
+- fixed potentially problematic chaining involved getShippingCarrier method
+Fixed No ability to open PDF file with Label
+Fixed Incorrect final price for configurable products if several custom options used
+Fixed "Length", "Width" and "Height" fields on "Create Packages" pop up are active, when "Documents" type is selected in IE7 and IE9
+Fixed HTTP 500 error on front-end for bundle fixed with percent options enabled for sub-products
+Fixed Shipment created on Magento side doesn't send to Google side for Merchant Calculated shipping
+- added check for process only Google Checkout internal methods
+Fixed PDF files for invoices and credit memos are not displaying Including Tax Price
+Fixed Default value that was specified in system settings doesn't presented in Code Format drop-down on Manage Coupon Codes tab
+Fixed Qty wipes out to 0 when no qty column is included on import
+Fixed Broken controls makeup is observed after resizing window when customer's page is opened on the back-end
+Fixed Values don't fit to "Date Fields Order" drop-downs in "Date & Time Custom Options" on the Catalog page
+Fixed Processing error appears for products with "Qty Uses Decimals" = No and enabled DHL International
+Fixed Apply Tax to FPT setting doesn't seem to work for products with Fixed Product Taxes
+Fixed Apply Coupon Code textbox doesn't fit in the Apply Coupon Code channel on the back-end after reducing the browser window
+Fixed Tax and Shipping amounts aren't showing on the merchant reports for Websites Payments Pro PayFlow Edition
+Fixed Incorrect error popup on Manage Coupon Codes tab in Shopping Cart Price Rule
+Fixed No ability to create Shipping Label with New DHL shipping methods
+Fixed Indexing update on save takes too long for large catalog_product_entity_int tables
+Fixed VAT ID group validation takes Default configuration on order creation from back-end
+Fixed Pagination isn't shown on My Product Reviews page when items count exceeds the "Show per page" setting
+Fixed Inline translation missing for customer account information labels
+Fixed Corrupted text if drag attribute on Manage Attribute Sets page (IE8)
+Fixed Wrong calculation price of Bundle product with Fixed price, when special price is configured
+Fixed Error Message isn't displayed during unsuccessful Shipping Label creation
+Fixed Unverified redirect is possible in Checkout controller
+Fixed Customer group in not validated again on checkout if Tax Calculation Based on = Shipping Address
+Fixed "Clear All" link doesn't work
+Fixed Wrong message appears when products quantity is updated in the Shopping Cart with enabled Qty Increments setting
+Fixed Created On field on Manage Coupon Codes grid shows incorrect date/time
+Fixed Incorrect price calculation of configurable product with custom options
+Fixed Manage Products > Custom options: Should be possible to enter negative price for custom option of 'Date' type
+Fixed HTTP 500 Internal Server Error on Admin Forgot Password page
+Fixed CSV/Excel XML export doesn't work on Sales->Invoices if filter by Selected=Yes is used
+Fixed "Same As Billing Address" check-box doesn't work
+Fixed Impossible to enter zero in the base price field for customer groups
+Fixed Group Price attribute position on the Prices tab is incorrect
+Fixed Add new column to the grid with number of used coupons
+Fixed Custom options are not stored when downloadable product is duplicated
+Fixed Broken logic for "Zero Subtotal Checkout" order statuses
+Fixed Coupon codes generation fails when trying to generate large amount of codes
+Fixed PayFlow Link: Using "Pay with PayPal" and selected shipping method that is greater than 0 doesn't process order
+Fixed User have to stay on Add New Rule page if error appears on save shopping cart price rule
+Fixed "Automatically Invoice All Items" should be inactive, when were selected "New Order Status: Pending" in "Zero Subtotal Checkout" settings
+Fixed When enormous request in search fields on the front end 414 error appears
+Fixed JS error on edit Shopping Cart Price Rule Page
+Fixed Clear Shopping Cart button add selected item to Items Ordered if check box "Add to Order" is selected
+Fixed "Clear Shopping Cart" button must be located to the left to "Update Shopping Cart" button
+Fixed Export of Group Price data doesn't work
+Fixed Incorrect translation messages definitions
+Fixed Error message isn't displayed if currency exchange rate not found (in case with DHL Int)
+Fixed User role with partial access can't edit attributes of configurable products
+Fixed Letter "n" missed in the word "handling"
+Fixed Buttons don't react for pressing on the "Widget Options" section in Insert Widget window
+Fixed Regular price displays incorrect
+Fixed {{base_url}} in (un)secure_url doesn't work since 1.6.1
+Fixed Product selection field gets cleared out with recently added products from latest page
+Fixed "Change" button while checkout doesn't work
+Fixed MySQL BIGINT field type is wrongly casted to integer
+Fixed Magento Connect Manager proceed with installation of extension if error appears on database backup
+Fixed "Set product as New from/to Date" works excluding selected dates
+Fixed Function fireEvent from lib/varien/js.js does not work in IE9
+Fixed Searching with first and last name has no results
+Fixed CMS Pages: Error in IE7 when select CMS page
+Fixed White screen appears instead of 404 Error Page when going to review a product which doesn't exist
+Fixed "Maximum Package Weight" option works incorrect in case with decimal Qty in shopping Cart
+Fixed Unable to create tables for new EAV entity via SQL upgrade script
+Fixed Customer group isn't revalidated on checkout if Enable Automatic Assignment to Customer Group = Yes
+Fixed Mistake in PayPal Payments Advanced fieldset title
+Fixed Zero Subtotal Checkout payment method is used, when it is disabled in settings
+Fixed Some info lost from address when customer sets this address as default for shipping
+Fixed Incorrect calculation logic during distribution products between several pieces (in case with DHL)
+Fixed No ability to get shipping rates from US to another country (in case with DHL)
+Fixed Incorrect calculation of pieces weight (in case with Bundle Product)
+Fixed Product Flat Data index causes replication lag on MySQL master/slave model
+Fixed Exception is shown, when admin user provides filtration of Newsletter problem reports by Subscriber
+Fixed Typo in JavaScript error message
+Fixed Unable to do mass action update for products
+Fixed Error Message isn't displayed if currency exchange rate not found (in case with DHL)
+Fixed Weight field is absent during Quick simple product creation
+Fixed correct helper resolving
+Fixed Shipping methods are shown twice in DHLs shipping quote
+Fixed Unable to translate shipping and billing forms on the order creation page
+Fixed Drop-down attribute with layered navigation filter doesn't work with value is set to 0
+Fixed Free Shipping options doesn't work (in case with DHL)
+Fixed Handling Fee doesn't applied Per Package
+Fixed Free Shipping options works incorrect
+Fixed WYSIWYG Editor: It's impossible insert Widget to CMS page content
+Fixed Customer's group is not changed if his billing address modified within backend
+Fixed Wrong behaviour and exception while using invalid image
+Fixed Uninformative error message during saving two nodes with the same parameter URL Key
+Fixed Unable to change order addresses in the admin panel
+Fixed PayPal Express always uses default billing address from customer account
+Fixed Unable to place order if customer selects Register on checkout
+Fixed Performance Issue: Most Viewed product reports on large amount of items
+Fixed In "Customer Addresses" block before and after of State name is located symbols ","
+Fixed Lightbox 2.5 with IE7 returns JS error on the page
+Fixed Unable to change customer status (confirmed/not confirmed) when customer logged in
+Fixed Incorrect notification for empty field during creation catalog price rules
+Fixed Unable to save product with non-checked multiple select attribute
+Fixed Package Size setting for DHL
+Fixed No Input Validation for Catalog Fields
+Fixed Row Total Calculation in Refund
+Fixed "Maximum number of price intervals" should be written with capital letters
+Fixed Divide Order Weight options for DHL
+Fixed Impossible to create new customer in the backend
+Fixed Catalog data-upgrade-1.6.0.0.4-1.6.0.0.5.php is exteremly slow
+Fixed Free Shipping options doesn't work (in case with DHL International)
+Fixed Mage_Catalog_Helper_Product::getProduct() doesn't load product by its SKU
+Fixed Preview Template doesn't work correctly
+Fixed Some options of Bundle Product disappeared from the Invoice PDF
+Fixed "Allow Countries" affects on "Country of Manufacture" attribute
+Fixed Some phrases are not translated
+Fixed Incorrect Ordered Qty in Order (in case with decimal qty)
+Fixed Trademark character isn't being displayed properly in the PDF invoice
+Fixed Can't search transactions by order_id in manager.paypal.com
+Fixed Inline Translation: Grid headers are displayed incorrect on the Tag Edit page
+Fixed "Create Extension Package" page becomes broken after compilation
+Fixed Price including tax isn't displayed for some kinds of bundle products
+Fixed Layered navigation for prices displays incorrect price ranges in manual mode
+Fixed Pager works wrong with float page number
+Fixed Incorrect foreign key for EAV entity tables
+Fixed Misprint in downloader/lib/Mage/Connect/Command/Install.php
+Fixed URL Rewrites must be case-sensitive
+Fixed Unable to install package via uploader if author name contains dash
+Fixed Fixed invoice subtotals for cases with partial invoice and discount
+Fixed Catalog URL Rewrites works incorrectly on creating categories
+Fixed New Oder Status setting, specified for payment method works incorrectly when only virtual products are present in Order
+Fixed Rounding issue in catalog and product view if price includes tax
+Fixed Wrong status of catalog event is displayed by editing catalog event
+Fixed Role Resources are not saved
+Fixed "Qty for Item's Status to Become Out of Stock" option works incorrect
+Fixed XML parser works incorrect
+Fixed Mage_Reports_Model_Mysql4_Product_Index_Abstract must be declared abstract
+Fixed "Date & Time" and "Time" custom options becomes required when editing product
+Fixed Unable to cancel an order for an expired Authorize.net auth
+Fixed Custom options are not stored when downloadable product is duplicated
+Fixed "Cannot initialize the indexer process" error during Mass "Reindex Data" Action
+Fixed Search by new attribute fails, attribute is not shown in layered navigation
+Fixed Exception when "Price Navigation Step Calculation" set to "Manual" mode and FPT enabled
+Fixed WPPHS: Cancel URL doesn't work as should be
+Fixed Error about insufficient permissions is not appears on database backup creation
+Fixed After rollback admin doesn't redirected to the Log in to Admin Panel page
+Fixed Database Backup must not include indexer table data
+Fixed Scheduled Backup creation/failure isn't logged
+Fixed Deleting backup while it is used by another process
+Fixed Opening *.tar files causes an error "There are no trailing zero-filled records"
+Fixed Unable to search by "Time" and "No" in Backups table
+Fixed Backups are deleted without confirmation
+Fixed Reports must be excluded from database snapshot backup
+Fixed There are no products in filtering results, if step calculation in automatic mode
+Fixed No validation for "Default Price Navigation Step"
+Fixed "Back" button doesn't work on the Create New Order page
+Fixed Incorrect logic of Token expiration in Two Step Password Reset flow
+Fixed Tag is present in tool-tip for field "Number of results (For the last time placed)" on the Edit Search page
+Fixed Unnecessary hard code in Magento Extension
+Fixed Wrong logic in Mage_Core_Model_Resource_Db_Collection_Abstract::join()
+Fixed Description and Short Description are displayed incorrectly for products added with WYSIWYG
+Fixed Adding product to the cart from the product review page leads to 404 page
+Fixed Special symbols in Sort Order field
+Fixed Text is wrong displayed with enabled Inline translation for Admin on back-end
+Fixed Inline Translation: Unable to translate some customer information
+Fixed Useless colon on front-end login page
+Fixed Unable to continue checkout for product with zero price and non-zero shipping price
+Fixed Import news_from_date field is configured poorly. It is not accepting the data from file
+Fixed When updating product data through import, attributes that have a value cannot be assigned a new value that is empty
+Fixed Unable to replace non-complex data for products with empty values during import
+Fixed "Wrong order ID" exception in PayPal Express module under heavy load
+Fixed Tax is applying on the order when creating it in the admin panel for a Customer Group with no taxes
+Fixed Issue with retrieving order statuses for array of states
+Fixed Wrong calculation product price with custom option type = Field and Fixed price
+Fixed Back ordered downloadable product is not available even when it is set to be be accessible when order status is Pending
+Fixed Missing column "position" at table catalog_category_anc_products_index_tmp
+Fixed Incorrect behavior of "Save in address book" option during admin Order creation for a new customer
+- refactored Mage_Adminhtml_Model_Sales_Order_Create::_prepareCustomer()
+Fixed Terms and Conditions is named differently on different pages
+Fixed "Apply" and "Discount Amount" fields appear twice in the Catalog Price Rule
+Fixed Poll shows incorrect percentage
+Fixed Added validation ability for admin configuration forms
+Fixed UPS XML misprint
+Fixed Misprint in uploading files form
+Fixed Unnecessary check boxes for gift options
+Fixed Wrong resource section declaration in Mage_Tag module
+Fixed "Customers Submitted this Tag" section doesn't update when customer has deleted tag from his account
+Fixed Correct product in category position
+Fixed Unable to create folder in Media Storage
+Fixed Translation with single quotes breaks JavaScript
+Fixed Out of memory error with hundreds of thousands of coupons attached to a single sales rule
+Fixed Unable to translate buttons and tabs on the "Manage Category" page
+Fixed Product Categories Tree doesn't expand in Manage Products page
+Fixed Incorrect products qty returns to stock after refund for configurable product
+Fixed Swf Uploader problems with cross domain Flash Player Policy
+Fixed Unable to translate "Layout Updates" block on create/edit widget page
+Fixed IE7: "Remember Me" checkbox visible on billing information step
+Fixed CMS WYSIWYG Editor - widget is inserted as new while editing in IE8
+Fixed Currency code doesn't correspond to the amount in reports
+Fixed Mage_Adminhtml_Block_Sales_Order_View_Tab_History::getFullHistory() doesn't use unique keys for each message
+Fixed Scope labels are shown without translate wrapper
+Fixed Wrong parameters handling in Core Helper formatDate()
+Fixed Apostrophe in store name breaks Google Analytics tracking
+Fixed Customer attribute prefix is not shown on frontend
+Fixed Incorrect rounding for product with custom options (percent price)
+Fixed Invoicing only part of products results in wrong totals calculation
+Fixed Incorrect Row Total Calculation in Refund
+- fixed rounding issues for partial Invoice and Refund
+- refactored delta rounding
+Fixed Filter by "Allow Countries" not working for Customer Address Form in the Backend
+- checking added for set country to be in available list
+Fixed There are sql-installs with empty string used as defaults for table columns, while column is not null able
+Fixed Unable to translate "Note" in "Product Stock Options"
+Fixed Various warning are displayed after creating shipment for 0 items
+Fixed Invalid content in Content-header in the top of page during scrolling during order creation
+Fixed "Online invoice" button present in backend when using Zero Subtotal Checkout
+Fixed String cast type in in_array function
+Fixed Newsletter template content should not disappear when "Show" / "Hide Editor" button was clicked
+Fixed Import feature doesn't validate whether super_products_sku is existing or not
+Fixed Cannot place order with downloadable product and discount code using Paypal Express payment method
+Fixed Product still out of stock after Stock Status reindex
+Fixed Save catalog price rule gives trace if full reindex has already started
+Fixed Reindex requires notification is not shown for Stock Status when stock is updated for several products using Mass Action
+Fixed Incorrect FedEx's shipping rates (in case with non-US country origin)
+Fixed After partial reindex MSRP value is not applied (not viewed) in catalog during mass update action
+Fixed Wrong stock reindex on catalog if partial reindex done after full reindex started
+Fixed In error message string "already exists." written twice, when trying to save Product Tax Class with the same name
+Fixed Slow checkout with non-flushed cache
+Fixed Bundle product total is incorrect in Customization block
+Fixed Special price isn't considered for bundle dynamic products in "Your Customization" block
+Fixed Situation when any amount of duplicate reindex process can be running at one time
+Fixed Error with Advanced Search (in case with Date Attribute)
+Fixed Product Flat Data index isn't marked as "Reindex Required" after importing products when Flat Catalog is enabled
+Fixed User can't change root category for the store
+Fixed JS error causes the overwrite of Title field in PayPal Advanced configuration
+Fixed Mass action doesn't partially reindex catalog for product name/description
+Fixed Remove hint about $1 auth amount from informational message text (PayflowLink configuration)
+Fixed Mass action doesn't partially reindex catalog for product prices
+Fixed PayPal Payments Advanced works with $0 Auth instead of Full Auth
+Fixed Impossible to place Order using "Pay with PayPal" button from PayPal Payments Advanced iframe
+Fixed Mass action doesn't partially reindex catalog search for product if searchable attribute was updated
+Fixed "Please wait" AJAX screen doesn't appear in the middle of the page
+Fixed Checkout link on frontend is always referenced as http
+Fixed GET request is incorrectly formed during category creation
+- adjusted assertion to determine last viewed store
+Fixed Display of Tier Pricing with Configurable Products
+- added functionality to dynamically update tier prices accordingly to chosen product configuration
+Fixed Google Analytics e-commerce tracking not working
+Fixed URL key isn't used while product save
+Fixed Added validation class to 'Qty increments'
+Fixed Entered from admin customer date 1970 (or less) is saved as 2070 (or less)
+Fixed cUrl resource must be closed after checking it for errors, not before
+Fixed Exception while products mass update attributes in backend
+Fixed No ability to reindex Catalog URL Rewrites, error is shown
+Fixed Package with Core dependency
+Fixed Stock Availability isn't updated if 1: Run Price Reindex 2: Update Stock Availability on product with mass action/single product
+Fixed Blank page instead shopping cart page when compilation and PSC are enabled
+Fixed Unable to save redirect URL with special characters in search terms
+Fixed Attribute Set field should have client-side validation and appropriate information message
+Fixed "Localhost" isn't a valid domain name for installation
+Fixed Iframe for PayPal Payments Advanced is not loaded
+Fixed Retain the selected tab on editing CMS page
+Fixed Payflow Link Express Checkout (pay with PayPal button) payment
+Fixed Wrong number of reindex options is displayed
+Fixed Wrong phpDocs for Varien_Db_Select
+Fixed JavaScript calendar date range
+- fixed JS calendar behavior to use 4-digits year format
+Fixed Performance issue connected with sales rules on adding product to cart
+Fixed DHL same error message appears several times
+Fixed Item Status says "Mixed" when an order has been completed, should say "Shipped"
+Fixed Product option title is absent in backend order page
+Fixed Incorrect items number during multi shipping checkout
+Fixed User name displays differently in the unsuccessful message and in the text field label (log in form)
+Fixed If one or more indexers have Update Required = Yes and all Status = READY for all indexers than there is no notification for user to do reindex action
+Fixed No space between Address line 1 and line 2 in Shipping Label (in case with FedEx)
+Fixed JS works depends on the position attributes of the product
+Fixed Char set encoding is out-of-date in Settlement reports
+Fixed Settlement reports can't be downloaded if in merchant's account 'Settlement file' is set to 6.0 version
+Fixed Unable to login when secure and unsecure URLs are different
+Fixed Customer session lost when using different domain/subdomain names for secure and unsecure URLs
+Fixed "Most Viewed" reports ignore Store View switcher
+Fixed Long FPT name (and product name) doesn't fit into "My cart" block
+Fixed Paypal IPN post back failure
+Fixed Customer was unable to receive newsletters when it was created via backend
+Fixed Wrong Comments History in notification of order creation/cancellation
+Fixed Non escaped string causes javascript error
+Fixed Unable to view pictures during product editing
+Fixed Ampersand is saved incorrect in attribute label
+Fixed IE8: JS error appears after pressing 'Add new rule' in catalog price rules menu
+Fixed Exception after sorting newsletter queue
+Fixed Customer is not able to log in from URL without "www" in some cases
+Fixed SQL error on category view with enabled and configured FPT
+Fixed Automatic reindexing based on matched events doesn't change "Status" and "Last Run" columns at process list grid
+Fixed Performance issue with Magento Compiler + APC results in too many I/O calls
+Fixed Website Administrator is able to change default values
+Fixed Some of wishlist blocks and templates still treat the collection of wishlist items as collection of products
+Fixed Unnecessary comments in "Share Wishlist" email
+
+
+
==== 1.7.0.0-beta1 ====
=== Improvements ===
diff --git a/api.php b/api.php
new file mode 100644
index 0000000000..6430d5cceb
--- /dev/null
+++ b/api.php
@@ -0,0 +1,88 @@
+loadAreaPart(Mage_Core_Model_App_Area::AREA_GLOBAL, Mage_Core_Model_App_Area::PART_EVENTS);
+Mage::app()->loadAreaPart(Mage_Core_Model_App_Area::AREA_ADMINHTML, Mage_Core_Model_App_Area::PART_EVENTS);
+
+// query parameter "type" is set by .htaccess rewrite rule
+$apiAlias = Mage::app()->getRequest()->getParam('type');
+
+// check request could be processed by API2
+if (in_array($apiAlias, Mage_Api2_Model_Server::getApiTypes())) {
+ /** @var $server Mage_Api2_Model_Server */
+ $server = Mage::getSingleton('api2/server');
+
+ $server->run();
+} else {
+ /* @var $server Mage_Api_Model_Server */
+ $server = Mage::getSingleton('api/server');
+ $adapterCode = $server->getAdapterCodeByAlias($apiAlias);
+
+ // if no adapters found in aliases - find it by default, by code
+ if (null === $adapterCode) {
+ $adapterCode = $apiAlias;
+ }
+ try {
+ $server->initialize($adapterCode);
+ $server->run();
+
+ Mage::app()->getResponse()->sendResponse();
+ } catch (Exception $e) {
+ Mage::logException($e);
+
+ echo $e->getMessage();
+ exit;
+ }
+}
diff --git a/app/Mage.php b/app/Mage.php
index 1b6fb4ffd5..8736004b52 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -171,7 +171,7 @@ public static function getVersionInfo()
'minor' => '7',
'revision' => '0',
'patch' => '0',
- 'stability' => 'beta',
+ 'stability' => 'rc',
'number' => '1',
);
}
@@ -373,6 +373,7 @@ public static function getStoreConfigFlag($path, $store = null)
* Get base URL path by type
*
* @param string $type
+ * @param null|bool $secure
* @return string
*/
public static function getBaseUrl($type = Mage_Core_Model_Store::URL_TYPE_LINK, $secure = null)
@@ -434,17 +435,16 @@ public static function addObserver($eventName, $callback, $data = array(), $obse
* Dispatch event
*
* Calls all observer callbacks registered for this event
- * and multiobservers matching event name pattern
+ * and multiple observers matching event name pattern
*
* @param string $name
- * @param array $args
+ * @param array $data
* @return Mage_Core_Model_App
*/
public static function dispatchEvent($name, array $data = array())
{
Varien_Profiler::start('DISPATCH EVENT:'.$name);
$result = self::app()->dispatchEvent($name, $data);
- #$result = self::registry('events')->dispatch($name, $data);
Varien_Profiler::stop('DISPATCH EVENT:'.$name);
return $result;
}
@@ -455,7 +455,7 @@ public static function dispatchEvent($name, array $data = array())
* @link Mage_Core_Model_Config::getModelInstance
* @param string $modelClass
* @param array|object $arguments
- * @return Mage_Core_Model_Abstract
+ * @return Mage_Core_Model_Abstract|false
*/
public static function getModel($modelClass = '', $arguments = array())
{
@@ -584,6 +584,7 @@ public static function exception($module = 'Mage_Core', $message = '', $code = 0
*
* @param string $message
* @param string $messageStorage
+ * @throws Mage_Core_Exception
*/
public static function throwException($message, $messageStorage = null)
{
diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php
index 6be88b6db4..34d8b355c3 100644
--- a/app/code/core/Mage/Admin/Model/User.php
+++ b/app/code/core/Mage/Admin/Model/User.php
@@ -61,7 +61,7 @@
class Mage_Admin_Model_User extends Mage_Core_Model_Abstract
{
/**
- * Configuration pathes for email templates and identities
+ * Configuration paths for email templates and identities
*/
const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'admin/emails/forgot_email_template';
const XML_PATH_FORGOT_EMAIL_IDENTITY = 'admin/emails/forgot_email_identity';
diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php
index ba19c9865e..11fac2ac94 100644
--- a/app/code/core/Mage/AdminNotification/Model/Inbox.php
+++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php
@@ -117,4 +117,94 @@ public function parse(array $data)
{
return $this->getResource()->parse($this, $data);
}
+
+ /**
+ * Add new message
+ *
+ * @param int $severity
+ * @param string $title
+ * @param string|array $description
+ * @param string $url
+ * @param bool $isInternal
+ * @return Mage_AdminNotification_Model_Inbox
+ */
+ public function add($severity, $title, $description, $url = '', $isInternal = true)
+ {
+ if (!$this->getSeverities($severity)) {
+ Mage::throwException($this->__('Wrong message type'));
+ }
+ if (is_array($description)) {
+ $description = '
__('This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our privacy policy page To accept cookies from this site, please click accept below.', $this->getPrivacyPolicyLink()) ?>
-
+
__('This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.', $this->getPrivacyPolicyLink()) ?>
diff --git a/app/etc/modules/Mage_Api2.xml b/app/etc/modules/Mage_Api2.xml
new file mode 100644
index 0000000000..e329b8230f
--- /dev/null
+++ b/app/etc/modules/Mage_Api2.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+ true
+ core
+
+
+
+
+
+
+
diff --git a/app/etc/modules/Mage_OAuth.xml b/app/etc/modules/Mage_OAuth.xml
new file mode 100644
index 0000000000..f4aad0ee37
--- /dev/null
+++ b/app/etc/modules/Mage_OAuth.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+ true
+ core
+
+
+
+
+
+
diff --git a/app/locale/en_US/Mage_AdminNotification.csv b/app/locale/en_US/Mage_AdminNotification.csv
index b1a36d13a3..42673c2eed 100644
--- a/app/locale/en_US/Mage_AdminNotification.csv
+++ b/app/locale/en_US/Mage_AdminNotification.csv
@@ -24,6 +24,7 @@
"Unable to proceed. Please, try again.","Unable to proceed. Please, try again."
"Update Frequency","Update Frequency"
"Use HTTPS to Get Feed","Use HTTPS to Get Feed"
+"Wrong message type","Wrong message type"
"critical","critical"
"major","major"
"minor","minor"
diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
index 0d2004beda..8cc67436fe 100644
--- a/app/locale/en_US/Mage_Adminhtml.csv
+++ b/app/locale/en_US/Mage_Adminhtml.csv
@@ -19,6 +19,7 @@
"(You have to increase php memory_limit before changing this value)","(You have to increase php memory_limit before changing this value)"
"(\\t for tab)","(\\t for tab)"
"* - If indexing is in progress, it will be killed and new indexing process will start.","* - If indexing is in progress, it will be killed and new indexing process will start."
+"* Required Fields","* Required Fields"
"- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"
"- Hold mouse button on any of the above buttons for faster selection.","- Hold mouse button on any of the above buttons for faster selection."
"- Use the %s buttons to select month","- Use the %s buttons to select month"
@@ -42,6 +43,7 @@
"2YTD","2YTD"
"6 Hours","6 Hours"
"
404 Error
Page not found.
","
404 Error
Page not found.
"
+"%s request access to your account","%s request access to your account"
"Attention: Captcha is case sensitive.","Attention: Captcha is case sensitive."
"A user with the same user name or email aleady exists.","A user with the same user name or email aleady exists."
"API Key","API Key"
@@ -85,6 +87,7 @@
"Advanced Admin Section","Advanced Admin Section"
"Advanced Profiles","Advanced Profiles"
"Advanced Section","Advanced Section"
+"After authorization application will have access to you account.","After authorization application will have access to you account."
"All","All"
"All Allowed Countries","All Allowed Countries"
"All Cache","All Cache"
@@ -146,7 +149,12 @@
"Associated Tags","Associated Tags"
"Attribute Set Name:","Attribute Set Name:"
"Attributes","Attributes"
-"Automatic","Automatic"
+"Authorization confirmed","Authorization confirmed"
+"Authorize","Authorize"
+"Authorize application","Authorize application"
+"Authorized OAuth Tokens","Authorized OAuth Tokens"
+"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
+"Automatic (equalize product counts)","Automatic (equalize product counts)"
"Average Order Amount","Average Order Amount"
"Average Orders","Average Orders"
"BINARY","BINARY"
@@ -212,10 +220,12 @@
"Complete","Complete"
"Configuration","Configuration"
"Confirm New Password","Confirm New Password"
+"Confirm token authorization Pop Up for admin","Confirm token authorization Pop Up for admin"
+"Confirm token authorization for admin","Confirm token authorization for admin"
+"Confirmation Of Authorization","Confirmation Of Authorization"
"Confirmed email:","Confirmed email:"
"Connect with the Magento Community","Connect with the Magento Community"
"Continue","Continue"
-"Continuous","Continuous"
"Convert to Plain Text","Convert to Plain Text"
"Cookie (unsafe)","Cookie (unsafe)"
"Country","Country"
@@ -379,6 +389,7 @@
"General Section","General Section"
"Get Image Base64","Get Image Base64"
"Get help for this page","Get help for this page"
+"Give the verifier code to application administrator","Give the verifier code to application administrator"
"Global Attribute","Global Attribute"
"Global Record Search","Global Record Search"
"Global Search","Global Search"
@@ -484,8 +495,10 @@
"Local Server","Local Server"
"Local/Remote Server","Local/Remote Server"
"Locale","Locale"
+"Log In","Log In"
"Log Out","Log Out"
"Log in to Admin Panel","Log in to Admin Panel"
+"Log in to use %s","Log in to use %s"
"Log into Magento Admin Page","Log into Magento Admin Page"
"Logged in as %s","Logged in as %s"
"Login","Login"
@@ -524,6 +537,7 @@
"Most Viewed Products","Most Viewed Products"
"Multiple Select","Multiple Select"
"My Account","My Account"
+"My Applications","My Applications"
"N/A","N/A"
"NOTICE","NOTICE"
"Name","Name"
@@ -597,6 +611,9 @@
"Number of Uses","Number of Uses"
"Number of Views","Number of Views"
"Number of records:","Number of records:"
+"OAuth Consumers","OAuth Consumers"
+"OAuth authorization for admin","OAuth authorization for admin"
+"OAuth authorization simple for admin","OAuth authorization simple for admin"
"OK","OK"
"Old rate:","Old rate:"
"One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details.","One or more media files failed to be synchronized during the media storages syncronization process. Refer to the log file for details."
@@ -741,6 +758,7 @@
"Quantity","Quantity"
"Queue Refresh","Queue Refresh"
"Queued... Cancel","Queued... Cancel"
+"REST Roles","REST Roles"
"Radio Buttons","Radio Buttons"
"Rates","Rates"
"Read details","Read details"
@@ -760,6 +778,10 @@
"Refresh Statistics","Refresh Statistics"
"Region/State","Region/State"
"Regular Price:","Regular Price:"
+"Reject","Reject"
+"Reject token authorization Pop Up for admin","Reject token authorization Pop Up for admin"
+"Reject token authorization for admin","Reject token authorization for admin"
+"Rejection Of Authorization","Rejection Of Authorization"
"Release","Release"
"Release Stability","Release Stability"
"Release Version","Release Version"
@@ -1076,6 +1098,7 @@
"User Role","User Role"
"User Roles","User Roles"
"User Roles Information","User Roles Information"
+"User Type Resources","User Type Resources"
"User name","User name"
"Users","Users"
"VAT Number is Invalid","VAT Number is Invalid"
@@ -1089,6 +1112,7 @@
"Variable ID","Variable ID"
"Variable Name","Variable Name"
"Variable Plain Value","Variable Plain Value"
+"Verifier code: %s","Verifier code: %s"
"View Actions XML","View Actions XML"
"View Full Size","View Full Size"
"View Memo","View Memo"
diff --git a/app/locale/en_US/Mage_Api.csv b/app/locale/en_US/Mage_Api.csv
index 5c6674a0d9..c7352a4a01 100644
--- a/app/locale/en_US/Mage_Api.csv
+++ b/app/locale/en_US/Mage_Api.csv
@@ -1,4 +1,5 @@
"Access denied.","Access denied."
+"Can not find webservice adapter.","Can not find webservice adapter."
"Client Session Timeout (sec.)","Client Session Timeout (sec.)"
"Default Response Charset","Default Response Charset"
"Email","Email"
@@ -7,10 +8,10 @@
"Invalid webservice handler specified.","Invalid webservice handler specified."
"Magento Core API","Magento Core API"
"Magento Core API Section","Magento Core API Section"
-"Roles","Roles"
+"SOAP/XML-RPC - Roles","SOAP/XML-RPC - Roles"
+"SOAP/XML-RPC - Users","SOAP/XML-RPC - Users"
"Unable to login.","Unable to login."
"User Name","User Name"
-"Users","Users"
"WS-I Compliance","WS-I Compliance"
"Web Services","Web Services"
"Your account has been deactivated.","Your account has been deactivated."
diff --git a/app/locale/en_US/Mage_Api2.csv b/app/locale/en_US/Mage_Api2.csv
new file mode 100644
index 0000000000..be092fd6db
--- /dev/null
+++ b/app/locale/en_US/Mage_Api2.csv
@@ -0,0 +1,203 @@
+"%s","%s"
+"ACL Attribute Rules","ACL Attribute Rules"
+"ACL Attributes Information","ACL Attributes Information"
+"Add","Add"
+"Add Admin Role","Add Admin Role"
+"Add New Role","Add New Role"
+"Address Type","Address Type"
+"Admin","Admin"
+"Allow","Allow"
+"An error occurred while deleting the role.","An error occurred while deleting the role."
+"An error occurred while saving attribute rules.","An error occurred while saving attribute rules."
+"An error occurred while saving role.","An error occurred while saving role."
+"Api Rules Information","Api Rules Information"
+"Assigned","Assigned"
+"Associate to Website","Associate to Website"
+"Attribute Rules Information","Attribute Rules Information"
+"Attributes","Attributes"
+"Automatically Return Credit Memo Item to Stock","Automatically Return Credit Memo Item to Stock"
+"Back","Back"
+"Backorders","Backorders"
+"Base Currency","Base Currency"
+"Base Customer Balance","Base Customer Balance"
+"Base Discount","Base Discount"
+"Base Discount Amount","Base Discount Amount"
+"Base Item Subtotal","Base Item Subtotal"
+"Base Item Subtotal Including Tax","Base Item Subtotal Including Tax"
+"Base Original Price","Base Original Price"
+"Base Price","Base Price"
+"Base Price Including Tax","Base Price Including Tax"
+"Base Shipping","Base Shipping"
+"Base Shipping Discount","Base Shipping Discount"
+"Base Shipping Tax","Base Shipping Tax"
+"Base Subtotal","Base Subtotal"
+"Base Subtotal Including Tax","Base Subtotal Including Tax"
+"Base Tax Amount","Base Tax Amount"
+"Base Total Due","Base Total Due"
+"Base Total Paid","Base Total Paid"
+"Base Total Refunded","Base Total Refunded"
+"Can Be Divided into Multiple Boxes for Shipping","Can Be Divided into Multiple Boxes for Shipping"
+"Canceled Qty","Canceled Qty"
+"Catalog","Catalog"
+"CatalogInventory","CatalogInventory"
+"City","City"
+"Company","Company"
+"Country","Country"
+"Coupon Code","Coupon Code"
+"Create","Create"
+"Created From","Created From"
+"Customer","Customer"
+"Customer Address","Customer Address"
+"Customer Address ID","Customer Address ID"
+"Customer Balance","Customer Balance"
+"Customer First Name","Customer First Name"
+"Customer ID","Customer ID"
+"Customer Last Name","Customer Last Name"
+"Customer Middle Name","Customer Middle Name"
+"Customer Prefix","Customer Prefix"
+"Customer Suffix","Customer Suffix"
+"Delete","Delete"
+"Deny","Deny"
+"Disable automatic group change based on VAT ID","Disable automatic group change based on VAT ID"
+"Discount","Discount"
+"Discount Amount","Discount Amount"
+"Discount Description","Discount Description"
+"Edit","Edit"
+"Edit %s ACL attribute rules","Edit %s ACL attribute rules"
+"Edit Role","Edit Role"
+"Edit attribute rules for %s Role","Edit attribute rules for %s Role"
+"Email","Email"
+"Enable Qty Increments","Enable Qty Increments"
+"First Name","First Name"
+"Gift Message","Gift Message"
+"Grand Total","Grand Total"
+"Grand Total to Be Charged","Grand Total to Be Charged"
+"Group","Group"
+"Guest","Guest"
+"ID","ID"
+"Invoiced Qty","Invoiced Qty"
+"Is Confirmed","Is Confirmed"
+"Is Default Billing Address","Is Default Billing Address"
+"Is Default Shipping Address","Is Default Shipping Address"
+"Item ID","Item ID"
+"Item Subtotal","Item Subtotal"
+"Item Subtotal Including Tax","Item Subtotal Including Tax"
+"Last Logged In","Last Logged In"
+"Last Name","Last Name"
+"Low Stock Date","Low Stock Date"
+"Manage Stock","Manage Stock"
+"Maximum Qty Allowed in Shopping Cart","Maximum Qty Allowed in Shopping Cart"
+"Minimum Qty Allowed in Shopping Cart","Minimum Qty Allowed in Shopping Cart"
+"New Role","New Role"
+"Notify for Quantity Below","Notify for Quantity Below"
+"OAuth","OAuth"
+"Order Addresses","Order Addresses"
+"Order Comments","Order Comments"
+"Order Currency","Order Currency"
+"Order Date","Order Date"
+"Order ID","Order ID"
+"Order ID (internal)","Order ID (internal)"
+"Order Item ID","Order Item ID"
+"Order Items","Order Items"
+"Order Status","Order Status"
+"Ordered Qty","Ordered Qty"
+"Orders","Orders"
+"Original Price","Original Price"
+"Parent Order Item ID","Parent Order Item ID"
+"Payment Method","Payment Method"
+"Phone Number","Phone Number"
+"Placed from IP","Placed from IP"
+"Please enter a valid number in ""max_sale_qty"" field","Please enter a valid number in ""max_sale_qty"" field"
+"Please enter a valid number in ""min_qty"" field","Please enter a valid number in ""min_qty"" field"
+"Please enter a valid number in ""min_sale_qty"" field","Please enter a valid number in ""min_sale_qty"" field"
+"Please enter a valid number in ""notify_stock_qty"" field","Please enter a valid number in ""notify_stock_qty"" field"
+"Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas.","Please use numbers only in ""qty_increments"" field. Please avoid spaces or other characters such as dots or commas."
+"Price","Price"
+"Price Including Tax","Price Including Tax"
+"Product","Product"
+"Product ID","Product ID"
+"Product and Custom Options Name","Product and Custom Options Name"
+"Qty","Qty"
+"Qty Increments","Qty Increments"
+"Qty Uses Decimals","Qty Uses Decimals"
+"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
+"REST - Attributes","REST - Attributes"
+"REST - Roles","REST - Roles"
+"REST ACL Attributes","REST ACL Attributes"
+"REST Attributes","REST Attributes"
+"REST Role","REST Role"
+"REST Roles","REST Roles"
+"REST Roles Information","REST Roles Information"
+"Read","Read"
+"Refunded Qty","Refunded Qty"
+"Rest Roles","Rest Roles"
+"Retrieve","Retrieve"
+"Role ""%s"" no longer exists","Role ""%s"" no longer exists"
+"Role ""%s"" not found.","Role ""%s"" not found."
+"Role API Resources","Role API Resources"
+"Role Info","Role Info"
+"Role Information","Role Information"
+"Role Name","Role Name"
+"Role Users","Role Users"
+"Role has been deleted.","Role has been deleted."
+"Roles","Roles"
+"SKU","SKU"
+"Sales","Sales"
+"Save","Save"
+"Shipped Qty","Shipped Qty"
+"Shipping Amount","Shipping Amount"
+"Shipping Discount","Shipping Discount"
+"Shipping Including Tax","Shipping Including Tax"
+"Shipping Method","Shipping Method"
+"Shipping Tax","Shipping Tax"
+"State","State"
+"Stock Availability","Stock Availability"
+"Stock ID","Stock ID"
+"Stock Item","Stock Item"
+"Store Currency to Order Currency Rate","Store Currency to Order Currency Rate"
+"Store Name","Store Name"
+"Street","Street"
+"Subtotal","Subtotal"
+"Subtotal Including Tax","Subtotal Including Tax"
+"System","System"
+"Tax Amount","Tax Amount"
+"Tax Name","Tax Name"
+"Tax Percent","Tax Percent"
+"Tax Rate","Tax Rate"
+"The ""enable_qty_increments"" field must be set to 0 or 1.","The ""enable_qty_increments"" field must be set to 0 or 1."
+"The ""is_decimal_divided"" field must be set to 0 or 1.","The ""is_decimal_divided"" field must be set to 0 or 1."
+"The ""is_in_stock"" field must be set to 0 or 1.","The ""is_in_stock"" field must be set to 0 or 1."
+"The ""is_qty_decimal"" field must be set to 0 or 1.","The ""is_qty_decimal"" field must be set to 0 or 1."
+"The ""is_qty_decimal"" field must be set to 0, 1, or 2.","The ""is_qty_decimal"" field must be set to 0, 1, or 2."
+"The ""manage_stock"" field must be set to 0 or 1.","The ""manage_stock"" field must be set to 0 or 1."
+"The ""stock_status_changed_auto"" field must be set to 0 or 1.","The ""stock_status_changed_auto"" field must be set to 0 or 1."
+"The ""use_config_backorders"" field must be set to 0 or 1.","The ""use_config_backorders"" field must be set to 0 or 1."
+"The ""use_config_enable_qty_inc"" field must be set to 0 or 1.","The ""use_config_enable_qty_inc"" field must be set to 0 or 1."
+"The ""use_config_manage_stock"" field must be set to 0 or 1.","The ""use_config_manage_stock"" field must be set to 0 or 1."
+"The ""use_config_max_sale_qty"" field must be set to 0 or 1.","The ""use_config_max_sale_qty"" field must be set to 0 or 1."
+"The ""use_config_min_qty"" field must be set to 0 or 1.","The ""use_config_min_qty"" field must be set to 0 or 1."
+"The ""use_config_min_sale_qty"" field must be set to 0 or 1.","The ""use_config_min_sale_qty"" field must be set to 0 or 1."
+"The ""use_config_notify_stock_qty"" field must be set to 0 or 1.","The ""use_config_notify_stock_qty"" field must be set to 0 or 1."
+"The ""use_config_qty_increments"" field must be set to 0 or 1.","The ""use_config_qty_increments"" field must be set to 0 or 1."
+"The attribute rules were saved.","The attribute rules were saved."
+"The role has been saved.","The role has been saved."
+"The role is a special one and not for assigning it to admin users.","The role is a special one and not for assigning it to admin users."
+"Total Due","Total Due"
+"Total Paid","Total Paid"
+"Total Refunded","Total Refunded"
+"Update","Update"
+"Use Config Settings for Backorders","Use Config Settings for Backorders"
+"Use Config Settings for Enable Qty Increments","Use Config Settings for Enable Qty Increments"
+"Use Config Settings for Manage Stock","Use Config Settings for Manage Stock"
+"Use Config Settings for Maximum Qty Allowed in Shopping Cart","Use Config Settings for Maximum Qty Allowed in Shopping Cart"
+"Use Config Settings for Minimum Qty Allowed in Shopping Cart","Use Config Settings for Minimum Qty Allowed in Shopping Cart"
+"Use Config Settings for Notify for Quantity Below","Use Config Settings for Notify for Quantity Below"
+"Use Config Settings for Qty Increments","Use Config Settings for Qty Increments"
+"Use Config Settings for Qty for Item's Status to Become Out of Stock","Use Config Settings for Qty for Item's Status to Become Out of Stock"
+"User Type","User Type"
+"User type ""%s"" no longer exists","User type ""%s"" no longer exists"
+"User type ""%s"" not found.","User type ""%s"" not found."
+"Web Services","Web Services"
+"Web services","Web services"
+"Write","Write"
+"ZIP/Postal Code","ZIP/Postal Code"
diff --git a/app/locale/en_US/Mage_Backup.csv b/app/locale/en_US/Mage_Backup.csv
index 5d3ceb0139..6af5f4f312 100644
--- a/app/locale/en_US/Mage_Backup.csv
+++ b/app/locale/en_US/Mage_Backup.csv
@@ -28,8 +28,8 @@
"Not enough free space to create backup.","Not enough free space to create backup."
"Not enough permissions to create backup.","Not enough permissions to create backup."
"Not enough permissions to perform rollback","Not enough permissions to perform rollback"
-"Please deselect the sufficient check-box, if you want to continue backup's creation","Please deselect the sufficient check-box, if you want to continue backup's creation"
-"Please deselect the sufficient check-box, if you want to continue rollback processing","Please deselect the sufficient check-box, if you want to continue rollback processing"
+"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the backup."""
+"Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback.""","Please either unselect the ""Put store on the maintenance mode"" checkbox or update your permissions to proceed with the rollback."""
"Put store on the maintenance mode while backup's creation","Put store on the maintenance mode while backup's creation"
"Rollback","Rollback"
"Scheduled Backup Settings","Scheduled Backup Settings"
@@ -41,10 +41,11 @@
"The database backup has been created.","The database backup has been created."
"The file was compressed with Zlib, but this extension is not installed on server.","The file was compressed with Zlib, but this extension is not installed on server."
"The selected backup(s) has been deleted.","The selected backup(s) has been deleted."
+"The system (excluding Media) backup has been created.","The system (excluding Media) backup has been created."
"The system backup has been created.","The system backup has been created."
"Time","Time"
"Type","Type"
"Unable to create backup. Please, try again later.","Unable to create backup. Please, try again later."
"Unable to save the cron expression.","Unable to save the cron expression."
-"Warning! System couldn't put store on the maintenance mode.","Warning! System couldn't put store on the maintenance mode."
"Wrong order of creation for new backup.","Wrong order of creation for new backup."
+"You do not have sufficient permissions to enable Maintenance Mode during this operation.","You do not have sufficient permissions to enable Maintenance Mode during this operation."
diff --git a/app/locale/en_US/Mage_CatalogSearch.csv b/app/locale/en_US/Mage_CatalogSearch.csv
index 9149c0114e..4b34c898f4 100644
--- a/app/locale/en_US/Mage_CatalogSearch.csv
+++ b/app/locale/en_US/Mage_CatalogSearch.csv
@@ -20,7 +20,7 @@
"List","List"
"Maximum Query Length","Maximum Query Length"
"Maximum Query Words Count","Maximum Query Words Count"
-"Maximum Search query length is %s. Your query was cut.","Maximum Search query length is %s. Your query was cut."
+"Maximum Search query length is %s. Your query was cut.","Maximum Search query length is %s. Your query was cut."
"Maximum words count is %1$s. In your search query was cut next part: %2$s.","Maximum words count is %1$s. In your search query was cut next part: %2$s."
"Minimal Query Length","Minimal Query Length"
"Minimum Search query length is %s","Minimum Search query length is %s"
diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv
index 0b437ec81f..8cb81395af 100644
--- a/app/locale/en_US/Mage_Core.csv
+++ b/app/locale/en_US/Mage_Core.csv
@@ -138,6 +138,7 @@
"General Contact Email","General Contact Email"
"General Contact Name","General Contact Name"
"General Settings","General Settings"
+"Get info about current Magento installation","Get info about current Magento installation"
"Global","Global"
"HTML Head","HTML Head"
"HTML tags are not allowed","HTML tags are not allowed"
@@ -148,6 +149,7 @@
"If the current frame position does not cover utmost pages, will render link to current position plus/minus this value.","If the current frame position does not cover utmost pages, will render link to current position plus/minus this value."
"Incorrect credit card expiration date.","Incorrect credit card expiration date."
"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
+"Invalid URL '%value%'.","Invalid URL '%value%'."
"Invalid base url type","Invalid base url type"
"Invalid block name to set child %s: %s","Invalid block name to set child %s: %s"
"Invalid block type: %s","Invalid block type: %s"
@@ -171,6 +173,8 @@
"Logo Image","Logo Image"
"Logo Image Alt","Logo Image Alt"
"Logo Image Src","Logo Image Src"
+"Magento info","Magento info"
+"Magento info API","Magento info API"
"Mail Sending Settings","Mail Sending Settings"
"Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/","Make sure that base URL ends with '/' (slash), e.g. http://yourdomain/magento/"
"Manage Stores","Manage Stores"
@@ -180,7 +184,6 @@
"Merge JavaScript Files","Merge JavaScript Files"
"Miscellaneous HTML","Miscellaneous HTML"
"Miscellaneous Scripts","Miscellaneous Scripts"
-"Model class does not exist: %s.","Model class does not exist: %s."
"Model collection resource name is not defined.","Model collection resource name is not defined."
"Module ""%1$s"" cannot depend on ""%2$s"".","Module ""%1$s"" cannot depend on ""%2$s""."
"Module ""%1$s"" requires module ""%2$s"".","Module ""%1$s"" requires module ""%2$s""."
@@ -256,6 +259,7 @@
"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Requested file may not include parent directory traversal (""../"", ""..\\ notation)"""
"Requested invalid store ""%s""","Requested invalid store ""%s"""
"Resource is not set.","Resource is not set."
+"Retrieve info about current Magento installation","Retrieve info about current Magento installation"
"Retrieve store data","Retrieve store data"
"Retrieve store list","Retrieve store list"
"Return-Path Email","Return-Path Email"
diff --git a/app/locale/en_US/Mage_Customer.csv b/app/locale/en_US/Mage_Customer.csv
index 89c8042a56..341036e37f 100644
--- a/app/locale/en_US/Mage_Customer.csv
+++ b/app/locale/en_US/Mage_Customer.csv
@@ -352,6 +352,7 @@
"Show Prefix","Show Prefix"
"Show Suffix","Show Suffix"
"Show Tax/VAT Number","Show Tax/VAT Number"
+"Show VAT Number on Frontend","Show VAT Number on Frontend"
"Sign Up for Newsletter","Sign Up for Newsletter"
"Skipping import row, required field ""%s"" is not defined.","Skipping import row, required field ""%s"" is not defined."
"Skipping import row, website ""%s"" field does not exist.","Skipping import row, website ""%s"" field does not exist."
@@ -360,7 +361,6 @@
"Store","Store"
"Store View","Store View"
"Street Address","Street Address"
-"Street Address ","Street Address "
"Street Address %s","Street Address %s"
"Subject","Subject"
"Submit","Submit"
@@ -411,6 +411,7 @@
"This email will be sent instead of default welcome email, after account confirmation.","This email will be sent instead of default welcome email, after account confirmation."
"This is My Default %s Address","This is My Default %s Address"
"To Cart","To Cart"
+"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
"Total","Total"
"Type","Type"
"Unknown","Unknown"
diff --git a/app/locale/en_US/Mage_Downloadable.csv b/app/locale/en_US/Mage_Downloadable.csv
index 0a37bc44a7..aeb27bcbc8 100644
--- a/app/locale/en_US/Mage_Downloadable.csv
+++ b/app/locale/en_US/Mage_Downloadable.csv
@@ -2,7 +2,6 @@
"Add New Row","Add New Row"
"Add links and samples to downloadable product","Add links and samples to downloadable product"
"Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.","Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'."
-"An error occurred while getting requested content. Please contact the store owner.","An error occurred while getting requested content. Please contact the store owner."
"An error occurred while getting the requested content.","An error occurred while getting the requested content."
"An error occurred while getting the requested content. Please contact the store owner.","An error occurred while getting the requested content. Please contact the store owner."
"An error occurred while saving the file(s).","An error occurred while saving the file(s)."
@@ -69,6 +68,7 @@
"See price before order confirmation.","See price before order confirmation."
"Shareable","Shareable"
"Shipped","Shipped"
+"Sorry, there was an error getting requested content. Please contact the store owner.","Sorry, there was an error getting requested content. Please contact the store owner."
"Sort Order","Sort Order"
"Start Download","Start Download"
"Status","Status"
diff --git a/app/locale/en_US/Mage_GoogleCheckout.csv b/app/locale/en_US/Mage_GoogleCheckout.csv
index 87b363f9ec..1d0ebde617 100644
--- a/app/locale/en_US/Mage_GoogleCheckout.csv
+++ b/app/locale/en_US/Mage_GoogleCheckout.csv
@@ -8,7 +8,6 @@
"A virtual item to reflect the discount total","A virtual item to reflect the discount total"
"A virtual item to reflect the tax total","A virtual item to reflect the tax total"
"AVS Status: %s","AVS Status: %s"
-"Add","Add"
"Add Shipping Method","Add Shipping Method"
"Allowed Methods","Allowed Methods"
"Amount: %s","Amount: %s"
@@ -109,8 +108,7 @@
"Rate 3 Ship To Applicable Countries","Rate 3 Ship To Applicable Countries"
"Rate 3 Ship to Specific Countries","Rate 3 Ship to Specific Countries"
"Rate 3 Title","Rate 3 Title"
-"Remove","Remove"
-"Required for live Google Checkout transactions.","Required for live Google Checkout transactions."
+"Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"").","Required for live Google Checkout transactions. Make sure that this option corresponds to Use Secure URLs in Frontend (""Web"" > ""Secure"")."
"Residential","Residential"
"Sandbox","Sandbox"
"Secure Callback URL","Secure Callback URL"
diff --git a/app/locale/en_US/Mage_ImportExport.csv b/app/locale/en_US/Mage_ImportExport.csv
index 029ea5d197..cda2066910 100644
--- a/app/locale/en_US/Mage_ImportExport.csv
+++ b/app/locale/en_US/Mage_ImportExport.csv
@@ -1,20 +1,27 @@
-" in rows: "," in rows: "
+"%s file does not exists or is not readable","%s file does not exists or is not readable"
"-- Please Select --","-- Please Select --"
"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract"
+"Adapter object must be an instance of %s","Adapter object must be an instance of %s"
"Adapter type must be a non empty string","Adapter type must be a non empty string"
+"Begin data validation","Begin data validation"
+"Begin export of %s","Begin export of %s"
+"Begin import of ""%s"" with ""%s"" behavior","Begin import of ""%s"" with ""%s"" behavior"
+"CSV","CSV"
"Can not determine attribute filter type","Can not determine attribute filter type"
-"Can not find required columns: ","Can not find required columns: "
-"Can not get autoincrement value","Can not get autoincrement value"
+"Can not find required columns: %s","Can not find required columns: %s"
+"Cannot get autoincrement value","Cannot get autoincrement value"
"Check Data","Check Data"
"Column names have duplicates","Column names have duplicates"
"Column names is empty or is not an array","Column names is empty or is not an array"
"Column names: ""%s"" are invalid","Column names: ""%s"" are invalid"
-"Continue","Continue"
+"Customers","Customers"
"Data is invalid or file is not uploaded","Data is invalid or file is not uploaded"
"Destination directory is not writable","Destination directory is not writable"
"Destination file is not writable","Destination file is not writable"
"Destination file path must be a string","Destination file path must be a string"
-"Entity Attributes","Entity Attributes"
+"Done import data validation","Done import data validation"
+"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
+"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract"
"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract"
"Entity is unknown","Entity is unknown"
"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract"
@@ -22,23 +29,24 @@
"Error in data structure: behaviors are mixed","Error in data structure: behaviors are mixed"
"Error in data structure: entity codes are mixed","Error in data structure: entity codes are mixed"
"Export","Export"
-"Export FAQ","Export FAQ"
-"FAQ","FAQ"
+"Export has been done.","Export has been done."
+"Exported %s rows.","Exported %s rows."
+"File does not contain data.","File does not contain data."
"File does not contain data. Please upload another one","File does not contain data. Please upload another one"
"File format is unknown","File format is unknown"
"File is partially valid, but import is not possible","File is partially valid, but import is not possible"
"File is totally invalid. Please fix errors and re-upload file","File is totally invalid. Please fix errors and re-upload file"
"File is valid! To start import process press ""Import"" button","File is valid! To start import process press ""Import"" button"
"File is valid, but import is not possible","File is valid, but import is not possible"
+"File was not uploaded","File was not uploaded"
"Header column names already set","Header column names already set"
"Import","Import"
-"Import / Export FAQ (Frequently Asked Questions)","Import / Export FAQ (Frequently Asked Questions)"
-"Import FAQ","Import FAQ"
+"Import has been done successfuly.","Import has been done successfuly."
"Import successfully done.","Import successfully done."
"Import/Export","Import/Export"
-"In/Out","In/Out"
"Input entity code is not equal to entity adapter code","Input entity code is not equal to entity adapter code"
"Invalid entity","Invalid entity"
+"Invalid entity model","Invalid entity model"
"Invalid file format","Invalid file format"
"Invalid parameters","Invalid parameters"
"Invalid seek position","Invalid seek position"
@@ -51,13 +59,15 @@
"Not implemented yet","Not implemented yet"
"Please fix errors and re-upload file","Please fix errors and re-upload file"
"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors"
-"Some other FAQ","Some other FAQ"
+"Products","Products"
"Source file moving failed","Source file moving failed"
"Source file path must be a string","Source file path must be a string"
"Source is not set","Source is not set"
"Status","Status"
-"System busy","System busy"
"There are no product types available for export","There are no product types available for export"
+"There is no data for export","There is no data for export"
"Total size of uploadable files must not exceed %s","Total size of uploadable files must not exceed %s"
"Uploaded file has no extension","Uploaded file has no extension"
-"Validation Results","Validation Results"
+"Validation finished successfully","Validation finished successfully"
+"in rows","in rows"
+"in rows:","in rows:"
diff --git a/app/locale/en_US/Mage_Index.csv b/app/locale/en_US/Mage_Index.csv
index 4d02a5509c..4de4d3ae35 100644
--- a/app/locale/en_US/Mage_Index.csv
+++ b/app/locale/en_US/Mage_Index.csv
@@ -6,6 +6,7 @@
"Change Index Mode","Change Index Mode"
"Click here to go to Cache Management and refresh cache types.","Click here to go to Cache Management and refresh cache types."
"Click here to go to Index Management and rebuild required indexes.","Click here to go to Index Management and rebuild required indexes."
+"Delete","Delete"
"Description","Description"
"Disable","Disable"
"Enable","Enable"
@@ -32,6 +33,7 @@
"Refresh","Refresh"
"Reindex Data","Reindex Data"
"Reindex Required","Reindex Required"
+"Revoke","Revoke"
"Status","Status"
"System","System"
"The index has been saved.","The index has been saved."
diff --git a/app/locale/en_US/Mage_OAuth.csv b/app/locale/en_US/Mage_OAuth.csv
new file mode 100644
index 0000000000..1b204f18c9
--- /dev/null
+++ b/app/locale/en_US/Mage_OAuth.csv
@@ -0,0 +1,111 @@
+"%name% '%value%' is too long. It must has length %min% symbols.","%name% '%value%' is too long. It must has length %min% symbols."
+"%name% '%value%' is too short. It must has length %min% symbols.","%name% '%value%' is too short. It must has length %min% symbols."
+"%s request access to your account","%s request access to your account"
+"Admin","Admin"
+"After authorization application will have access to you account.","After authorization application will have access to you account."
+"An error occurred on confirm authorize.","An error occurred on confirm authorize."
+"An error occurred on delete action.","An error occurred on delete action."
+"An error occurred on delete application.","An error occurred on delete application."
+"An error occurred on reject authorize.","An error occurred on reject authorize."
+"An error occurred on saving consumer data.","An error occurred on saving consumer data."
+"An error occurred on update revoke status.","An error occurred on update revoke status."
+"An error occurred while deleting the consumer.","An error occurred while deleting the consumer."
+"An error occurred.","An error occurred."
+"An error occurred. Your authorization request is invalid.","An error occurred. Your authorization request is invalid."
+"App Name","App Name"
+"Application ""%s"" has been deleted.","Application ""%s"" has been deleted."
+"Application ""%s"" has been enabled.","Application ""%s"" has been enabled."
+"Application ""%s"" has been revoked.","Application ""%s"" has been revoked."
+"Application Name","Application Name"
+"Application not found.","Application not found."
+"Are you sure you want to delete this application?","Are you sure you want to delete this application?"
+"Are you sure you want to disable this application?","Are you sure you want to disable this application?"
+"Are you sure you want to enable this application?","Are you sure you want to enable this application?"
+"Authorization confirmed.","Authorization confirmed."
+"Authorize","Authorize"
+"Authorize application","Authorize application"
+"Authorized Tokens","Authorized Tokens"
+"Callback URL","Callback URL"
+"Cleanup Probability","Cleanup Probability"
+"Cleanup Settings","Cleanup Settings"
+"Confirm OAuth token authorization","Confirm OAuth token authorization"
+"Confirm token authorization Pop Up for admin","Confirm token authorization Pop Up for admin"
+"Confirm token authorization for admin","Confirm token authorization for admin"
+"Confirmation Of Authorization","Confirmation Of Authorization"
+"Consumer Information","Consumer Information"
+"Consumer Name","Consumer Name"
+"Consumers","Consumers"
+"Created At","Created At"
+"Customer","Customer"
+"Customer My Account My OAuth Applications","Customer My Account My OAuth Applications"
+"Delete","Delete"
+"Disable","Disable"
+"Disabled","Disabled"
+"Edit","Edit"
+"Edit Consumer","Edit Consumer"
+"Email","Email"
+"Email Address","Email Address"
+"Enable","Enable"
+"Enabled","Enabled"
+"Entry with ID #%s not found.","Entry with ID #%s not found."
+"Expiration Period","Expiration Period"
+"Give the verifier code to application administrator","Give the verifier code to application administrator"
+"ID","ID"
+"Invalid Callback URL","Invalid Callback URL"
+"Invalid ID parameter.","Invalid ID parameter."
+"Invalid Rejected Callback URL","Invalid Rejected Callback URL"
+"Invalid entry ID.","Invalid entry ID."
+"Invalid revoke status.","Invalid revoke status."
+"Key","Key"
+"Log in as a customer","Log in as a customer"
+"Log in as admin","Log in as admin"
+"Log in as customer","Log in as customer"
+"Log in to use %s","Log in to use %s"
+"Login","Login"
+"My Applications","My Applications"
+"Name","Name"
+"New Consumer","New Consumer"
+"OAuth","OAuth"
+"OAuth Admin My Apps","OAuth Admin My Apps"
+"OAuth Authorized Tokens","OAuth Authorized Tokens"
+"OAuth Consumers","OAuth Consumers"
+"OAuth authorization for admin","OAuth authorization for admin"
+"OAuth authorization for customer","OAuth authorization for customer"
+"OAuth authorization simple for admin","OAuth authorization simple for admin"
+"Password","Password"
+"Permissions","Permissions"
+"Please select needed row(s).","Please select needed row(s)."
+"Please select revoke status.","Please select revoke status."
+"REST - My Apps","REST - My Apps"
+"REST - OAuth Authorized Tokens","REST - OAuth Authorized Tokens"
+"REST - OAuth Consumers","REST - OAuth Consumers"
+"Reject","Reject"
+"Reject OAuth token authorization","Reject OAuth token authorization"
+"Reject authorization","Reject authorization"
+"Reject token authorization Pop Up for admin","Reject token authorization Pop Up for admin"
+"Reject token authorization for admin","Reject token authorization for admin"
+"Rejected Callback URL","Rejected Callback URL"
+"Revoked","Revoked"
+"Role Name","Role Name"
+"Save","Save"
+"Save and Continue Edit","Save and Continue Edit"
+"Secret","Secret"
+"Selected entries enabled.","Selected entries enabled."
+"Selected entries has been deleted.","Selected entries has been deleted."
+"Selected entries revoked.","Selected entries revoked."
+"Status","Status"
+"System","System"
+"The application access request is rejected.","The application access request is rejected."
+"The consumer has been deleted.","The consumer has been deleted."
+"The consumer has been saved.","The consumer has been saved."
+"Token Status Change","Token Status Change"
+"Token Status Change Email Template","Token Status Change Email Template"
+"Unable to find a consumer.","Unable to find a consumer."
+"User ID","User ID"
+"User Name","User Name"
+"User Type","User Type"
+"Verifier code: %s","Verifier code: %s"
+"You have no applications.","You have no applications."
+"deleted","deleted"
+"enabled","enabled"
+"revoked","revoked"
diff --git a/app/locale/en_US/Mage_Page.csv b/app/locale/en_US/Mage_Page.csv
index 4c01f55ed9..23b46c72e7 100644
--- a/app/locale/en_US/Mage_Page.csv
+++ b/app/locale/en_US/Mage_Page.csv
@@ -63,7 +63,7 @@
"Select date","Select date"
"Show","Show"
"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled."
-"This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our privacy policy page To accept cookies from this site, please click accept below.","This website requires cookies provide all of its features. For more information on what data is contained in the cookies, please see our privacy policy page To accept cookies from this site, please click accept below."
+"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below.","This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our Privacy Policy page. To accept cookies from this site, please click the Allow button below."
"Time selection:","Time selection:"
"Time:","Time:"
"Welcome, %s!","Welcome, %s!"
diff --git a/app/locale/en_US/Mage_Payment.csv b/app/locale/en_US/Mage_Payment.csv
index 00cd16d0ea..0a6750e95e 100644
--- a/app/locale/en_US/Mage_Payment.csv
+++ b/app/locale/en_US/Mage_Payment.csv
@@ -10,19 +10,20 @@
"Auto Bill on Next Cycle","Auto Bill on Next Cycle"
"Automatically Invoice All Items","Automatically Invoice All Items"
"Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments).","Automatically bill the outstanding balance amount in the next billing cycle (if there were failed payments)."
+"Bank Transfer Payment","Bank Transfer Payment"
"Billing Agreement status is not set.","Billing Agreement status is not set."
"Billing Amount","Billing Amount"
"Billing Frequency","Billing Frequency"
"Billing Period","Billing Period"
"Billing Period Unit","Billing Period Unit"
"Billing period unit is not defined or wrong.","Billing period unit is not defined or wrong."
-"Cannot retrieve payment method instance.","Cannot retrieve payment method instance."
"Cannot retrieve the payment info model object.","Cannot retrieve the payment info model object."
"Cannot retrieve the payment information object instance.","Cannot retrieve the payment information object instance."
"Cannot retrieve the payment method code.","Cannot retrieve the payment method code."
"Cannot retrieve the payment method model object.","Cannot retrieve the payment method model object."
"Capture action is not available.","Capture action is not available."
"Card Verification Number","Card Verification Number"
+"Cash On Delivery Payment","Cash On Delivery Payment"
"Centinel API URL","Centinel API URL"
"Check / Money Order","Check / Money Order"
"Credit Card Number","Credit Card Number"
@@ -41,6 +42,7 @@
"Incorrect credit card expiration date.","Incorrect credit card expiration date."
"Initial Fee","Initial Fee"
"Initial non-recurring payment amount due immediately upon profile creation.","Initial non-recurring payment amount due immediately upon profile creation."
+"Instructions","Instructions"
"Internal Reference ID","Internal Reference ID"
"Invalid Credit Card Number","Invalid Credit Card Number"
"Issue Number","Issue Number"
@@ -111,6 +113,7 @@
"The number of billing cycles for payment period.","The number of billing cycles for payment period."
"The number of scheduled payments that can fail before the profile is automatically suspended.","The number of scheduled payments that can fail before the profile is automatically suspended."
"The payment review action is unavailable.","The payment review action is unavailable."
+"The requested Payment Method is not available.","The requested Payment Method is not available."
"Title","Title"
"Trial Billing Amount","Trial Billing Amount"
"Trial Billing Frequency","Trial Billing Frequency"
diff --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv
index c4b16999ba..472fe0d943 100644
--- a/app/locale/en_US/Mage_Sales.csv
+++ b/app/locale/en_US/Mage_Sales.csv
@@ -201,7 +201,7 @@
"Date Shipped","Date Shipped"
"Default Status","Default Status"
"Default Template","Default Template"
-"Default logo, will be used in PDF and HTML documents. (jpeg, tiff, png)","Default logo, will be used in PDF and HTML documents. (jpeg, tiff, png)"
+"Default logo, will be used in PDF and HTML documents. (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image","Default logo, will be used in PDF and HTML documents. (jpeg, tiff, png) If you see image distortion in PDF, try to use larger image"
"Delete","Delete"
"Delete Package","Delete Package"
"Denied the payment online.","Denied the payment online."
@@ -611,9 +611,7 @@
"Revenue","Revenue"
"Row Subtotal","Row Subtotal"
"Row Total","Row Total"
-"SHIP TO:","SHIP TO:"
"SKU","SKU"
-"SOLD TO:","SOLD TO:"
"Sales","Sales"
"Sales Discount","Sales Discount"
"Sales Emails","Sales Emails"
@@ -655,10 +653,12 @@
"Send Shipment Email Copy Method","Send Shipment Email Copy Method"
"Send Shipment Email Copy To","Send Shipment Email Copy To"
"Send Tracking Information","Send Tracking Information"
+"Send shipment info","Send shipment info"
"Set order for existing transactions not allowed","Set order for existing transactions not allowed"
"Ship","Ship"
"Ship To","Ship To"
"Ship to Name","Ship to Name"
+"Ship to:","Ship to:"
"Shipment","Shipment"
"Shipment #","Shipment #"
"Shipment #%1$s | %3$s (%2$s)","Shipment #%1$s | %3$s (%2$s)"
@@ -692,6 +692,7 @@
"Signed Up From","Signed Up From"
"Size","Size"
"Sku","Sku"
+"Sold to:","Sold to:"
"Some of the products below do not have all the required options. Please edit them and configure all the required options.","Some of the products below do not have all the required options. Please edit them and configure all the required options."
"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
"Source object is not specified.","Source object is not specified."
diff --git a/app/locale/en_US/Mage_Tax.csv b/app/locale/en_US/Mage_Tax.csv
index a7d4ea42c8..1d78ffbcef 100644
--- a/app/locale/en_US/Mage_Tax.csv
+++ b/app/locale/en_US/Mage_Tax.csv
@@ -8,7 +8,6 @@
"An error occurred while deleting this rate. Incorrect rate ID.","An error occurred while deleting this rate. Incorrect rate ID."
"An error occurred while deleting this tax class.","An error occurred while deleting this tax class."
"An error occurred while deleting this tax rule.","An error occurred while deleting this tax rule."
-"An error occurred while saving this rate.","An error occurred while saving this rate."
"An error occurred while saving this tax class.","An error occurred while saving this tax class."
"An error occurred while saving this tax class. A class with the same name","An error occurred while saving this tax class. A class with the same name"
"An error occurred while saving this tax rule.","An error occurred while saving this tax rule."
@@ -25,7 +24,6 @@
"Class Name","Class Name"
"Code","Code"
"Country","Country"
-"County","County"
"Custom price if available","Custom price if available"
"Customer Tax Class","Customer Tax Class"
"Customer Tax Class Information","Customer Tax Class Information"
diff --git a/app/locale/en_US/Mage_Usa.csv b/app/locale/en_US/Mage_Usa.csv
index ea2542a98a..c188f917e3 100644
--- a/app/locale/en_US/Mage_Usa.csv
+++ b/app/locale/en_US/Mage_Usa.csv
@@ -116,6 +116,7 @@
"Height","Height"
"Height, width and length should be equal or greater than %s","Height, width and length should be equal or greater than %s"
"Home Delivery","Home Delivery"
+"Hub ID","Hub ID"
"Inches","Inches"
"Indirect","Indirect"
"International Economy","International Economy"
@@ -180,6 +181,7 @@
"Piece Id barcode is missing","Piece Id barcode is missing"
"Piece number information is missing","Piece number information is missing"
"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."
+"Please, specify origin country","Please, specify origin country"
"Pounds","Pounds"
"Priority Mail","Priority Mail"
"Priority Overnight","Priority Overnight"
@@ -232,6 +234,7 @@
"Station","Station"
"Subtotal","Subtotal"
"Subtotal With Discount","Subtotal With Discount"
+"The field is applicable if the Smart Post method is selected.","The field is applicable if the Smart Post method is selected."
"The response is in wrong format.","The response is in wrong format."
"There is no available method for selected shipping address.","There is no available method for selected shipping address."
"There is no items in this order","There is no items in this order"
diff --git a/app/locale/en_US/Mage_XmlConnect.csv b/app/locale/en_US/Mage_XmlConnect.csv
index 0ec93c8cc6..df89016e7d 100644
--- a/app/locale/en_US/Mage_XmlConnect.csv
+++ b/app/locale/en_US/Mage_XmlConnect.csv
@@ -536,7 +536,7 @@
"Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px.","Store logo that is displayed on copyright page of app. Preferred size: 100px x 100px."
"Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px.","Store logo that is displayed on copyright page of app. Preferred size: 200px x 200px."
"Street Address","Street Address"
-"Street Address 2","Street Address 2"
+"Street Address %s","Street Address %s"
"Submission","Submission"
"Submission Fields","Submission Fields"
"Submission History","Submission History"
diff --git a/app/locale/en_US/template/email/token.html b/app/locale/en_US/template/email/token.html
new file mode 100644
index 0000000000..a615f4289a
--- /dev/null
+++ b/app/locale/en_US/template/email/token.html
@@ -0,0 +1,17 @@
+{* This is a comment block
+
+Available vars in this template:
+ - $userName User name
+ - $applicationName Application name
+ - $status Token new status
+
+Use vars: {{var var_name}}
+*}
+
+
+Hello, {{htmlescape var=$userName}}
+Your authorization to {{htmlescape var=$applicationName}} has been changed to {{htmlescape var=$status}} by Admin team.
diff --git a/cron.php b/cron.php
index 93fbe465c6..d555fca11a 100644
--- a/cron.php
+++ b/cron.php
@@ -38,6 +38,8 @@
Mage::app('admin')->setUseSessionInUrl(false);
+umask(0);
+
try {
Mage::getConfig()->init()->loadEventObservers('crontab');
Mage::app()->addEventArea('crontab');
diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php
index 50dfe1979a..233051d660 100755
--- a/downloader/Maged/Controller.php
+++ b/downloader/Maged/Controller.php
@@ -596,7 +596,7 @@ public function model($model = null, $singleton = false)
if (is_null($model)) {
$class = 'Maged_Model';
} else {
- $class = 'Maged_Model_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $model)));
+ $class = 'Maged_Model_' . str_replace(' ', '_', ucwords(str_replace('_', ' ', $model)));
if (!class_exists($class, false)) {
include_once str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
}
@@ -885,7 +885,20 @@ public function startInstall()
}
if (!empty($_GET['archive_type'])) {
- $isSuccess = $this->_createBackup($_GET['archive_type'], $_GET['backup_name']);
+
+ $backupName = $_GET['backup_name'];
+ $connect = $this->model('connect', true)->connect();
+ $isSuccess = true;
+
+ if (!preg_match('/^[a-zA-Z0-9\ ]{0,50}$/', $backupName)) {
+ $connect->runHtmlConsole('Please use only letters (a-z or A-Z), numbers (0-9) or space in '
+ . 'Backup Name field. Other characters are not allowed.');
+ $isSuccess = false;
+ }
+
+ if ($isSuccess) {
+ $isSuccess = $this->_createBackup($_GET['archive_type'], $_GET['backup_name']);
+ }
if (!$isSuccess) {
$this->endInstall();
@@ -981,7 +994,7 @@ public static function getVersionInfo()
'minor' => '7',
'revision' => '0',
'patch' => '0',
- 'stability' => 'beta',
+ 'stability' => 'rc',
'number' => '1',
);
}
@@ -996,7 +1009,7 @@ public static function getVersionInfo()
protected function _createBackup($archiveType, $archiveName){
/** @var $connect Maged_Connect */
$connect = $this->model('connect', true)->connect();
- $connect->runHtmlConsole('Creating data backup...');
+ $connect->runHtmlConsole('Creating backup...');
$isSuccess = false;
@@ -1066,7 +1079,7 @@ protected function _getCreateBackupSuccessMessageByType($type)
{
$messagesMap = array(
Mage_Backup_Helper_Data::TYPE_SYSTEM_SNAPSHOT => 'System backup has been created',
- Mage_Backup_Helper_Data::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'System backup has been created',
+ Mage_Backup_Helper_Data::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'System (excluding Media) backup has been created',
Mage_Backup_Helper_Data::TYPE_MEDIA => 'Database and media backup has been created',
Mage_Backup_Helper_Data::TYPE_DB => 'Database backup has been created'
);
diff --git a/downloader/lib/Mage/Archive.php b/downloader/lib/Mage/Archive.php
index 3e5f5ecfa8..70abdb5be5 100644
--- a/downloader/lib/Mage/Archive.php
+++ b/downloader/lib/Mage/Archive.php
@@ -84,7 +84,7 @@ protected function _getArchiver($extension)
} else {
$format = self::DEFAULT_ARCHIVER;
}
- $class = 'Mage_Archive_'.ucfirst($format);
+ $class = 'Mage_Archive_' . ucfirst($format);
$this->_archiver = new $class();
return $this->_archiver;
}
diff --git a/downloader/lib/Mage/Backup.php b/downloader/lib/Mage/Backup.php
index 88f2f48b43..5dc3c19283 100755
--- a/downloader/lib/Mage/Backup.php
+++ b/downloader/lib/Mage/Backup.php
@@ -48,7 +48,7 @@ class Mage_Backup
*/
static public function getBackupInstance($type)
{
- $class = 'Mage_Backup_' . $type;
+ $class = 'Mage_Backup_' . ucfirst($type);
if (!in_array($type, self::$_allowedBackupTypes) || !class_exists($class, true)){
throw new Mage_Exception('Current implementation not supported this type (' . $type . ') of backup.');
diff --git a/downloader/lib/Mage/Backup/Db.php b/downloader/lib/Mage/Backup/Db.php
index 7d49849759..5585ef3eaf 100755
--- a/downloader/lib/Mage/Backup/Db.php
+++ b/downloader/lib/Mage/Backup/Db.php
@@ -34,7 +34,7 @@
class Mage_Backup_Db extends Mage_Backup_Abstract
{
/**
- * Implementation Rollback functionality for Db
+ * Implements Rollback functionality for Db
*
* @return bool
*/
@@ -48,20 +48,10 @@ public function rollback()
$archiveManager = new Mage_Archive();
$source = $archiveManager->unpack($this->getBackupPath(), $this->getBackupsDir());
- $this->getResourceModel()->beginTransaction();
-
- $file = fopen($source, "r");
- $query = '';
- while(!feof($file)) {
- $line = fgets($file);
- $query .= $line;
- if ($this->_isLineLastInCommand($line)){
- $this->getResourceModel()->runCommand($query);
- $query = '';
- }
+ $file = new Mage_Backup_Filesystem_Iterator_File($source);
+ foreach ($file as $statement) {
+ $this->getResourceModel()->runCommand($statement);
}
- fclose($file);
- $this->getResourceModel()->commitTransaction();
@unlink($source);
$this->_lastOperationSucceed = true;
@@ -70,7 +60,7 @@ public function rollback()
}
/**
- * Check is line a last in sql command
+ * Checks whether the line is last in sql command
*
* @param $line
* @return bool
@@ -92,9 +82,9 @@ protected function _isLineLastInCommand($line)
}
/**
- * Implementation Create Backup functionality for Db
+ * Implements Create Backup functionality for Db
*
- * @return boolean
+ * @return bool
*/
public function create()
{
@@ -124,6 +114,6 @@ public function create()
*/
public function getType()
{
- return "db";
+ return 'db';
}
}
diff --git a/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php b/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php
new file mode 100644
index 0000000000..cddde3607e
--- /dev/null
+++ b/downloader/lib/Mage/Backup/Filesystem/Iterator/File.php
@@ -0,0 +1,112 @@
+
+ */
+class Mage_Backup_Filesystem_Iterator_File extends SplFileObject
+{
+ /**
+ * The statement that was last read during iteration
+ *
+ * @var string
+ */
+ protected $_currentStatement = '';
+
+ /**
+ * Return current sql statement
+ *
+ * @return string
+ */
+ public function current()
+ {
+ return $this->_currentStatement;
+ }
+
+ /**
+ * Iterate to next sql statement in file
+ */
+ public function next()
+ {
+ $this->_currentStatement = '';
+ while (!$this->eof()) {
+ $line = $this->fgets();
+ if (strlen(trim($line))) {
+ $this->_currentStatement .= $line;
+ if ($this->_isLineLastInCommand($line)) {
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * Return to first statement
+ */
+ public function rewind()
+ {
+ parent::rewind();
+ $this->next();
+ }
+
+ /**
+ * Check whether provided string is comment
+ *
+ * @param string $line
+ * @return bool
+ */
+ protected function _isComment($line)
+ {
+ return $line[0] == '#' || substr($line, 0, 2) == '--';
+ }
+
+ /**
+ * Check is line a last in sql command
+ *
+ * @param string $line
+ * @return bool
+ */
+ protected function _isLineLastInCommand($line)
+ {
+ $cleanLine = trim($line);
+ $lineLength = strlen($cleanLine);
+
+ $returnResult = false;
+ if ($lineLength > 0) {
+ $lastSymbolIndex = $lineLength - 1;
+ if ($cleanLine[$lastSymbolIndex] == ';') {
+ $returnResult = true;
+ }
+ }
+
+ return $returnResult;
+ }
+}
diff --git a/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php b/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php
index 40ae6f053b..4b1b413db9 100755
--- a/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php
+++ b/downloader/lib/Mage/Backup/Filesystem/Iterator/Filter.php
@@ -44,7 +44,7 @@ class Mage_Backup_Filesystem_Iterator_Filter extends FilterIterator
* Constructor
*
* @param Iterator $iterator
- * @param array $skipFiles
+ * @param array $filters list of files to skip
*/
public function __construct(Iterator $iterator, array $filters)
{
diff --git a/downloader/template/connect/packages.phtml b/downloader/template/connect/packages.phtml
index a0a3d812d9..92e6ea8ba5 100644
--- a/downloader/template/connect/packages.phtml
+++ b/downloader/template/connect/packages.phtml
@@ -32,7 +32,7 @@
-
+
@@ -53,11 +53,16 @@
-
-
+
+
+
+
-
+
+
+
Please use only letters (a-z or A-Z), numbers (0-9) or space in this field. Other characters are not allowed.
 ?>)
+  ?>){kind=small}
 ?> "<?php echo $this->__('Submitting order information...') ?>")
__('Submitting order information...') ?>
+