-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Modularity * Log module became switchable * New switchable module TaxImportExport was created * Sales module improvement: * Performance was improved * Complexity of the order persistence logic was reduced * Unit tests coverage for modules was increased: * Magento\Rule * Magento\Contact * Framework: * Composite and bundle save/load processors were added * Support for the complex custom attributes were added * Generic abstract data objects, that is simple and extensible (supports custom attributes), were created * Search Library: * Approach of matching the fields to table names was implemented * MySQL Adapter Library for Match and Filtered query types was added * Ability to filter queries was added * Response handler for MySQL adapter was added * XML declarations for full-text search were added * Functional tests: * Add Products to Order from Last Ordered Products Section * Add Products to Order from Products in Comparison List Section * Add Products to Order from Recently Compared Products Section * Create Configurable Product * Create Store * Create Website * Delete Product From Customer Wishlist On Backend * Delete Store * Delete Website * Viewed Products Report * Products In Cart Report * Manage Product Review from Customer Page * Mass Assign Customer Group * New Account Report * Update Product Review From Product Page * Update Store * Manage Product Review From Customer Page * Other: * Session.name ini set * Calls to setPublicCookie became more secured * Generating the session ID for sensitive data was added * Fixed bugs: * Placing the order from backend * Redirecting the customer to empty shopping cart instead of displaying credit card iFrame on checkout with for PayPal Payflow Link * Showing the message for multiple shipping address checkout in Authorize partial approval flow * Mess detector failure * flv_player security vulnerability * Calling the inexistent method in cart with shopping cart price rules * Overriding a non-empty custom attribute value with empty value in store view scope * Editing in 'WYSIWYG editor' by clicking "Use Default" checkbox when switched to store view scope * RSS list page vulnerability * Applying the store View title on frontend for configurable attributes * Viewing the uploaded sample in downloadable product * Google Shopping: Problem with publishing products if change value for option 'Update Google Shopping Item when Product is Updated' * Configuration scope of items' InStock status on order cancellation * Creating the new customer in admin * GitHub requests: * #621-- Parse error: syntax error, unexpected T_OBJECT_OPERATOR * #651-- Multishipping checkout add/edit address page issue
- Loading branch information
1 parent
f588199
commit 7ad2dc7
Showing
1,674 changed files
with
36,006 additions
and
19,386 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -188,3 +188,4 @@ | |
| ## http://developer.yahoo.com/performance/rules.html#etags | ||
|
|
||
| #FileETag none | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>CONTRIBUTOR LICENSE AGREEMENT</title> | ||
| <style> | ||
| body { | ||
| font-size: 14px; | ||
| } | ||
|
|
||
| ol { | ||
| counter-reset: list1; | ||
| font-family: Verdana, Arial, Helvetica, sans-serif; | ||
| padding-bottom: 12px; | ||
| } | ||
| li { | ||
| list-style-type: none; | ||
| padding-top: 12px; | ||
| } | ||
| ol li:before { | ||
| counter-increment: list1; | ||
| content: counter(list1) ". "; | ||
| } | ||
| ol ol { | ||
| counter-reset: list2; | ||
| } | ||
| ol ol li:before { | ||
| counter-increment: list2; | ||
| content: counter(list1) "." counter(list2) ". "; | ||
| } | ||
| h2 { | ||
| text-align: center; | ||
| font-family: Verdana, Arial, Helvetica, sans-serif; | ||
| } | ||
| p { | ||
| font-family: Verdana, Arial, Helvetica, sans-serif; | ||
| } | ||
| div { | ||
| width: 800px; | ||
| margin: 0 auto; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div> | ||
| <h2> | ||
| CONTRIBUTOR LICENSE AGREEMENT | ||
| </h2> | ||
| <p> | ||
| This Contributor License Agreement ("Agreement") is made and entered into as of _______________, 20__ (the "Effective Date"), by and between X.commerce, Inc. dba Magento, Inc., a Delaware corporation with its principal place of business at 10441 Jefferson Blvd., Suite 200, Culver City, CA 90232 ("Magento", "we", "us", or "our"), and ______________________________, a _______________ with its principal place of business at _______________________________________ ("Contributor", "you" or "your", and collectively with Magento, the "Parties"). | ||
| </p> | ||
| <ol> | ||
| <li><strong><u>Definitions:</u></strong> | ||
| <ol> | ||
| <li> | ||
| <strong>"Contribution"</strong> means any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Magento for inclusion in, or documentation of, any of the products or services owned or managed by Magento (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication provided to Magento or its representatives, including, but not limited to, communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Magento for the purpose of discussing, modifying, revising, and improving the Work, including identification of errors and/or issues and the remedy thereof. | ||
| </li> | ||
| <li> | ||
| <strong>"Contributor"</strong>, <strong>"you"</strong>, or <strong>"your"</strong> means the copyright owner or legal entity authorized by the copyright owner that is entering into this Agreement. | ||
| </li> | ||
| <li> | ||
| <strong>"Contributor Affiliate"</strong> means any past, present or future subsidiary, parent company, sister company, or other corporation, firm, business, partnership, joint venture or entity that controls, is controlled by, or is under common control of Contributor or any of its subsidiaries. | ||
| </li> | ||
| <li> | ||
| <strong>"Control"</strong> means (i) the power, direct or indirect, to cause the direction or management of an entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares of an entity, or (iii) beneficial ownership of an entity. | ||
| </li> | ||
| <li> | ||
| <strong>"Magento Affiliate"</strong> means any past, present or future subsidiary, parent company, sister company, or other corporation, firm, business, partnership, joint venture or entity that controls, is controlled by, or is under common control of Magento or any of its subsidiaries. | ||
| </li> | ||
| </ol> | ||
| </li> | ||
| <li><strong><u>License Grants:</u></strong> | ||
| <ol> | ||
| <li><strong>Grant of Copyright License.</strong> Subject to the terms and conditions of this Agreement, Contributor and Contributor Affiliates hereby grant to Magento, Magento Affiliates and all third party recipients of software, services, and all other information distributed by Magento as part of any Magento project, product or service a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Contributions and such derivative works.</li> | ||
| <li><strong>Grant of Patent License.</strong> Subject to the terms and conditions of this Agreement, Contributor and Contributor Affiliates hereby grant to Magento, Magento Affiliates, and all third party recipients of software, services, and information distributed by Magento as part of any Magento project, product or service a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Contributions, where such license applies only to those patent claims licensable by Contributor that are necessarily infringed by Contributions alone or by combination with software and/or information related to any Magento project, product or service.</li> | ||
| <li><strong>Grant to Magento and Magento Affiliates.</strong> The rights conferred in this Agreement on Magento shall automatically and immediately extend to any entity that later becomes a Magento Affiliate or a part of Magento.</li> | ||
| <li><strong>Contributions.</strong> Contributor agrees to the terms and conditions of this Agreement for present and future Contributions, which Contributor submits to Magento. Except for the licenses granted herein, Contributor reserves all right, title, and interest in and to Contributor Contributions.</li> | ||
| </ol> | ||
| </li> | ||
| <li> | ||
| <strong><u>Representations:</u></strong> | ||
| <ol> | ||
| <li><strong>Original Work.</strong> Contributor represents that each Contribution is Contributor’s own original creation and that Contributor is the copyright owner or legal entity authorized by the copyright owner of all Contributions.</li> | ||
| <li><strong>Ownership and Authority.</strong> Contributor represents that it is legally entitled to grant the licenses above and that the Contributions do not include any third party copyrights, patents, trade secrets, licenses, or other restrictions ("Third Party IP"), and that Contributor will not declare any dependencies on any open source projects, proprietary software or Third Party IP, unless Contributor has made a Complete Disclosure prior to or at the time of the Contribution submission.</li> | ||
| <li><strong>Complete Disclosure.</strong> If applicable, Contributor represents that each and every Contribution submission includes complete details of any third-party license or other restrictions associated with any part of the Contribution.</li> | ||
| <li><strong>Support.</strong> Contributor is not expected to provide support for Contributions, except to the extent Contributor desires to provide support. Contributor may provide support for free, for a fee, or not at all.</li> | ||
| <li><strong>Notification of any Change.</strong> You agree to notify Magento if any of the facts, circumstances or representations made herein are or become inaccurate in any respect.</li> | ||
| </ol> | ||
| </li> | ||
| <li> | ||
| <strong><u>General:</u></strong> | ||
| <ol> | ||
| <li><strong>Waiver.</strong> Contributor waives all other claims of any nature, including express contract, implied-in-fact contract, or quasi-contract, arising out of any disclosure of the Contributions to Magento. As such, Magento is under no obligation to use or implement the Contributions in any respect.</li> | ||
| <li><strong>Competitive or Similar Materials.</strong> In no event shall Magento or Magento Affiliates be precluded from discussing, reviewing, developing for itself, having developed, or developing for third parties, materials which are competitive with those set forth in the Contributions irrespective of their similarity to the information in the Contributions, so long as Magento complies with the terms of this Agreement.</li> | ||
| <li><strong>Term.</strong> This Agreement shall remain in effect for a period of five (5) years from the Effective Date or until termination in writing by either party is delivered to the other party.</li> | ||
| <li><strong>Governing Law.</strong> This Agreement will be construed as if both parties jointly wrote it, governed by California law except for its conflicts of laws principles, and any cause of action arising under or relating to this Agreement must be brought exclusively in a court in Santa Clara County, California. </li> | ||
| <li><strong>Survival.</strong> Upon termination or expiration of this Agreement, all terms of the Agreement, including the license grants, shall remain in full force and effect, except that Contributor will no longer make submissions to Magento.</li> | ||
| </ol> | ||
| </li> | ||
| </ol> | ||
| <p><strong>IN WITNESS WHEREOF,</strong> the Parties have caused this Agreement to be executed by their duly authorized representatives as of the Effective Date.</p> | ||
| <table border="0" width="100%"> | ||
| <tr> | ||
| <td width="9%"><strong>Magento, Inc.</strong></td> | ||
| <td width="15%"></td> | ||
| <td width="6%"></td> | ||
| <td width="9%"></td> | ||
| <td width="15%"><strong>Contributor</strong><br> | ||
| </tr> | ||
| <tr> | ||
| <td>By:</td> | ||
| <td><hr></td> | ||
| <td></td> | ||
| <td>By:</td> | ||
| <td><hr></td> | ||
| </tr> | ||
| <td>Name:</td> | ||
| <td><hr></td> | ||
| <td></td> | ||
| <td>Name:</td> | ||
| <td><hr></td> | ||
| </tr> | ||
| <tr> | ||
| <td>Title:</td> | ||
| <td><hr></td> | ||
| <td></td> | ||
| <td>Title:</td> | ||
| <td><hr></td> | ||
| </table> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.