magento-engcom-team
diff --git a/‎.gitignore
-3 b/‎.gitignore
-3
diff --git a/‎CHANGELOG.markdown
+41 b/‎CHANGELOG.markdown
+41
diff --git a/‎LICENSE.txt
+47-47 b/‎LICENSE.txt
+47-47
diff --git a/‎LICENSE_AFL.txt
+47-47 b/‎LICENSE_AFL.txt
+47-47
diff --git a/‎app/Mage.php
+1-1 b/‎app/Mage.php
+1-1
diff --git a/‎app/bootstrap.php
+12-6 b/‎app/bootstrap.php
+12-6
diff --git a/‎app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
-88 b/‎app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
-88
diff --git a/‎app/code/core/Mage/Adminhtml/Block/Api/Editroles.php
-69 b/‎app/code/core/Mage/Adminhtml/Block/Api/Editroles.php
-69
diff --git a/‎app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php
-81 b/‎app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php
-81
diff --git a/‎app/code/core/Mage/Adminhtml/Block/Api/Role.php
-46 b/‎app/code/core/Mage/Adminhtml/Block/Api/Role.php
-46
@@ -29,7 +29,4 @@ atlassian*
 /pub/media/customer/*
 /pub/media/downloadable/*
 /var/*
-dev/api-tests/config.php
-dev/api-tests/integration/tmp/*
-dev/api-tests/integration/framework/local-mysql.xml
 
@@ -1,3 +1,44 @@
+2.0.0.0-dev35
+=============
+* Enhancements of System Configuration:
+  * Introduced new items that can be configured in the similar to Magento 1.x way, using xml files: nested groups in System Configuration form, group dependencies, intersected dependencies
+  * Enhanced handling of field dependencies, required fields functionality
+  * Changed Configuration structure to be represented as an object model
+  * Improved performance of configuration rendering
+* Implemented new API in `Mage_Webapi` module
+  * Removed `Mage_Api` and `Mage_Api2` modules as obsolete API implementation
+  * Added support of REST and SOAP 1.2 [WS-I 2.0](http://ws-i.org/Profiles/BasicProfile-2.0-2010-11-09.html) APIs
+  * Introduced versioning per API resource. The application will support old version(s) of API after upgrading to not make old API requests fail
+  * Unified implementation for all API types
+  * Significantly simplified coverage of new API resources
+  * Added two-legged `OAuth` 1.0 for REST authentication
+  * Added WS-Security for SOAP authentication
+  * Added automatic generation of REST routes and SOAP WSDL on the basis of API class interface and annotations
+  * Introduced generation of API reference from annotated WSDL (for SOAP API)
+* Introduced service layer. Business logic should be implemented once on service layer and could be utilized from different types of controller (e.g., general or API)
+  * Business logic is implemented on service layer to be utilized from different types of controller (e.g., general or API)
+  * Implemented abstract service layer class - `Mage_Core_Service_ServiceAbstract`
+  * Implemented concrete service layers for customers, orders and quotes. Appropriate duplicate logic has been eliminated from controllers and API
+* Improved validation approach:
+  * Added support of describing validation rules in a module's configuration file - `validation.xml` in the module's `etc` directory
+  * Added `Mage_Core_Model_Validator_Factory`
+  * Added new validators to Magento Validator library
+  * Added `Magento_Translate_Adapter` as a translator for the validators
+  * New approach is utilized in `Mage_Customer`, `Mage_Eav` and `Mage_Webapi` modules
+* Added profiling of DB and cache requests
+* Minor Improvements:
+  * Added an ability to choose the image for logo and upload it from backend web-interface
+  * Added notification in backend in case of product SKU change
+* Bug fixes:
+  * Fixed bug in `Mage_Adminhtml_Sales_Order_CreditmemoController` that changed item’s stock status after each comment
+  * Removed `Debug` section in `System -> Configuration -> Advanced -> Developer` for default configuration scope
+  * Fixed bug in `Mage_Tax_Model_Resource_Calculation` that prevented placing order with two tax rules having the same rate
+  * Removed `Url Options` section in `System -> Configuration -> General -> Web` for website and store configuration scope
+  * Changed backend template for UPS shipping provider to fix translation issue
+* Fixed security issue - set `CURLOPT_SSL_VERIFYPEER` to `true` by default in cUrl calls
+* Added `Zend/Escaper`, `Zend/I18`, `Zend/Validator` ZF2 libraries
+* Updated `Zend/Server` and `Zend/Soap` libraries to ZF2 versions
+
 2.0.0.0-dev34
 =============
 * Test Framework:
 
@@ -170,7 +170,7 @@ public static function getVersionInfo()
             'revision'  => '0',
             'patch'     => '0',
             'stability' => 'dev',
-            'number'    => '34',
+            'number'    => '35',
         );
     }
 
 
@@ -18,9 +18,8 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category   Magento
- * @copyright  Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /* PHP version validation */
@@ -97,15 +96,22 @@
     Mage::initializeObjectManager($definitionsFile);
 }
 
+$output = null;
 if (isset($_SERVER['MAGE_PROFILER'])) {
     switch ($_SERVER['MAGE_PROFILER']) {
         case 'firebug':
-            Magento_Profiler::registerOutput(new Magento_Profiler_Output_Firebug());
+            $output = new Magento_Profiler_Driver_Standard_Output_Firebug();
             break;
         case 'csv':
-            Magento_Profiler::registerOutput(new Magento_Profiler_Output_Csvfile(__DIR__ . '/../var/log/profiler.csv'));
+            $output = new Magento_Profiler_Driver_Standard_Output_Csvfile(__DIR__ . '/../var/log/profiler.csv');
             break;
         default:
-            Magento_Profiler::registerOutput(new Magento_Profiler_Output_Html());
+            $output = new Magento_Profiler_Driver_Standard_Output_Html();
     }
 }
+
+if ($output) {
+    $driver = new Magento_Profiler_Driver_Standard();
+    $driver->registerOutput($output);
+    Magento_Profiler::add($driver);
+}
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public static function getVersionInfo()`
`170`	`170`	`'revision' => '0',`
`171`	`171`	`'patch' => '0',`
`172`	`172`	`'stability' => 'dev',`
`173`		`- 'number' => '34',`
	`173`	`+ 'number' => '35',`
`174`	`174`	`);`
`175`	`175`	`}`
`176`	`176`