Permalink
Commits on Nov 2, 2010
  1. Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …

    …merges/karwin-phpunit35
    
    Conflicts:
    	library/Zend/Filter/Encrypt/Openssl.php
    	library/Zend/Service/Akismet/Akismet.php
    	library/Zend/Service/Amazon/Amazon.php
    	library/Zend/Service/Amazon/Exception.php
    	library/Zend/Service/Amazon/Query.php
    	library/Zend/Service/Audioscrobbler/Audioscrobbler.php
    	library/Zend/Service/SlideShare/Exception.php
    	tests/Zend/Layout/FunctionalTest.php
    	tests/Zend/Markup/ParserIntegrityTest.php
    	tests/Zend/Server/ReflectionTest.php
    	tests/Zend/Service/Akismet/AkismetTest.php
    	tests/Zend/Service/Audioscrobbler/AlbumDataTest.php
    	tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php
    	tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
    	tests/Zend/Tag/ItemListTest.php
    	tests/Zend/Tag/ItemTest.php
    	tests/Zend/Text/MultiByteTest.php
    	tests/Zend/Text/TableTest.php
    	tests/Zend/Translate/Adapter/XmlTmTest.php
    	tests/Zend/Validator/BarcodeTest.php
    	tests/Zend/Validator/CallbackTest.php
    	tests/Zend/Validator/File/FilesSizeTest.php
    	tests/Zend/Validator/File/ImageSizeTest.php
    	tests/Zend/Validator/File/SizeTest.php
    	tests/Zend/Validator/File/UploadTest.php
    	tests/Zend/Validator/File/WordCountTest.php
    	tests/Zend/Validator/IbanTest.php
    	tests/Zend/Validator/MessageTest.php
    	tests/Zend/Validator/PostCodeTest.php
    	tests/Zend/Validator/RegexTest.php
    	tests/Zend/Validator/ValidateTest.php
    weierophinney committed Nov 2, 2010
  2. Merge branch 'aws-update' of http://github.com/farazdagi/zf2 into mer…

    …ges/farazdagi-aws
    
    Conflicts:
    	library/Zend/Service/Amazon/AbstractService.php
    weierophinney committed Nov 2, 2010
  3. Revert "Merge branch 'livedocx-2.0' of http://github.com/jonathanmaro…

    …n/zf2 into merges/jonathanmaron-livedocx"
    
    This reverts commit 2396268, reversing
    changes made to 3addea5.
    weierophinney committed Nov 2, 2010
  4. File transport: fixed exceptions, tests

    - Fixed to use new exception strategy
    - Made more easily testable
    - Removed underscore prefixes from protected attributes
    weierophinney committed Nov 2, 2010
  5. Merge branch 'proposals/zend_mail_transport_file' of http://github.co…

    …m/lcf/zf2 into merges/lcf-mail-file-transport
    weierophinney committed Nov 2, 2010
  6. Merge branch 'hotfixes/hostname_not_found' of http://github.com/lcf/zf2

    … into merges/lcf-hostname
    weierophinney committed Nov 2, 2010
  7. Merge branch 'livedocx-2.0' of http://github.com/jonathanmaron/zf2 in…

    …to merges/jonathanmaron-livedocx
    
    Conflicts:
    	library/Zend/Application/Resource/Modules.php
    	library/Zend/Loader.php
    	library/Zend/Loader/PluginLoader.php
    	library/Zend/Locale/Format.php
    	library/Zend/Log/Filter/Priority.php
    	library/Zend/Navigation/Page/Mvc.php
    	library/Zend/Session/Configuration/SessionConfiguration.php
    	library/Zend/Tool/Project/Context/Zf/ActionMethod.php
    	library/Zend/View/AbstractView.php
    weierophinney committed Nov 2, 2010
  8. Merge branch 'crypt-error' of http://github.com/mikaelkael/zf2 into m…

    …erges/mikaelkael-crypt-error
    weierophinney committed Nov 2, 2010
Commits on Nov 1, 2010
  1. ZF-8618: the default decode type should be TYPE_OBJECT (same behaviou…

    …r as of json_decode)
    
    + fixed some zf2 class conflicts within Zend\Json\Server
    marc-mabe committed Nov 1, 2010
Commits on Oct 31, 2010
  1. [ZF-10614] - fixed manual

    thomasweidner committed Oct 31, 2010
Commits on Oct 30, 2010
  1. Updated version strings

    weierophinney committed Oct 30, 2010
  2. Bring milestones/exceptions up-to-date with zf2/master

    Merge branch 'zf2/master' into milestones/exceptions
    
    Conflicts:
    	library/Zend/Amf/Parser/TypeLoader.php
    	library/Zend/Amf/Server.php
    	library/Zend/Application/AbstractBootstrap.php
    	library/Zend/File/Transfer/Adapter/AbstractAdapter.php
    	library/Zend/Filter/Inflector.php
    	library/Zend/Filter/InputFilter.php
    	library/Zend/Filter/StaticFilter.php
    	library/Zend/Form/Element.php
    	library/Zend/Form/Element/File.php
    	library/Zend/InfoCard/XML/Security/Transform/Exception.php
    	library/Zend/Navigation/Page/Mvc.php
    	library/Zend/Paginator/Paginator.php
    	library/Zend/Search/Lucene/Document/Exception.php
    	library/Zend/Serializer/Adapter/Amf0.php
    	library/Zend/Serializer/Adapter/Amf3.php
    	library/Zend/Serializer/Exception.php
    	library/Zend/Serializer/Serializer.php
    	library/Zend/Service/Amazon/Ec2/AbstractService.php
    	library/Zend/Tag/Cloud.php
    	library/Zend/Tag/Cloud/Decorator/Exception.php
    	library/Zend/Tag/Cloud/Decorator/HtmlTag.php
    	library/Zend/Test/PHPUnit/ControllerTestCase.php
    	library/Zend/Validator/StaticValidator.php
    	library/Zend/Wildfire/Protocol/Exception.php
    	library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php
    	tests/Zend/Application/AbstractBootstrapTest.php
    	tests/Zend/Filter/InputTest.php
    	tests/Zend/Filter/StaticFilterTest.php
    	tests/Zend/Form/ElementTest.php
    	tests/Zend/Form/FormTest.php
    	tests/Zend/Paginator/PaginatorTest.php
    	tests/Zend/Serializer/SerializerTest.php
    	tests/Zend/Tag/Cloud/CloudTest.php
    	tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
    	tests/Zend/Translate/Adapter/XmlTmTest.php
    weierophinney committed Oct 30, 2010
Commits on Oct 29, 2010
  1. Update Zend\Pdf unit tests to use more special exception types.

    Alexander Veremyev committed Oct 29, 2010
  2. Service\Amazon: SimpleDb UTs and classes updated

    Online UTs are ported to zf2 and do pass now.
    farazdagi committed Oct 29, 2010
  3. fix error in comments block.

    Alexander Veremyev committed Oct 29, 2010
Commits on Oct 28, 2010
  1. Merge branch 'zf2/master' into milestones/autoloading

    - Bring milestones/autoloading branch up-to-date with current master
    
    Conflicts:
    	library/Zend/Loader/Autoloader.php
    	library/Zend/Loader/PluginLoader.php
    	library/Zend/Serializer/Serializer.php
    	library/Zend/View/AbstractView.php
    	library/Zend/View/View.php
    	library/Zend/View/ViewEngine.php
    	tests/Zend/Loader/AutoloaderTest.php
    	tests/Zend/View/ViewTest.php
    weierophinney committed Oct 28, 2010