Permalink
Commits on Feb 23, 2011
  1. Fix parse error

    - Moved semicolon to end of fluent call
    weierophinney committed Feb 23, 2011
  2. Fixed testing issues

    - Translator adapter class had syntax errors
    - MultiDb resource needed updates to work with current Bootstrap versions
    - Disabled a test that relied on mocking
    weierophinney committed Feb 23, 2011
  3. Merge branch 'zf10984' of https://github.com/akorolyov/zf2 into hotfi…

    …x/zf-10984
    
    Conflicts:
    	tests/Zend/Application/Resource/MultidbTest.php
    weierophinney committed Feb 23, 2011
  4. Updated PHPUnit assertions

    - Used assertInternalType instead of assertType
    weierophinney committed Feb 23, 2011
  5. Merge branch 'SVNSync' of https://github.com/thomasweidner/zf2 into h…

    …otfix/thomasweidner-svnsync
    
    Conflicts:
    	documentation/manual/en/module_specs/Zend_Filter-PregReplace.xml
    weierophinney committed Feb 23, 2011
  6. Merge branch 'ResourcePL' of https://github.com/thomasweidner/zf2 int…

    …o feature/translate-resource-pl
    weierophinney committed Feb 23, 2011
  7. Merge branch 'ZF-10889' of https://github.com/thomasweidner/zf2 into …

    …feature/zf-10889
    
    Conflicts:
    	library/Zend/EventManager/HandlerAggregate.php
    	library/Zend/EventManager/ResponseCollection.php
    	library/Zend/SignalSlot/GlobalSignals.php
    	library/Zend/SignalSlot/Signals.php
    	library/Zend/Stdlib/FilterChain.php
    	tests/Zend/EventManager/TestAsset/MockAggregate.php
    	tests/Zend/EventManager/TestAsset/StaticEventsMock.php
    	tests/Zend/SignalSlot/GlobalSignalsTest.php
    	tests/Zend/SignalSlot/SignalsTest.php
    	tests/Zend/Stdlib/FilterChainTest.php
    weierophinney committed Feb 23, 2011
Commits on Feb 22, 2011
  1. Fixed view helper related tests

    - Cleaned up tests for files fixed in 8295394
    weierophinney committed Feb 22, 2011
  2. Merge branch 'ResourceES' of https://github.com/thomasweidner/zf2 int…

    …o feature/translate-resources-es
    weierophinney committed Feb 22, 2011
  3. Fix PHPUnit warnings

    - Changed assertType calls to assertInstanceOf
    weierophinney committed Feb 22, 2011
  4. Merge branch 'Generic_1' of https://github.com/thomasweidner/zf2 into…

    … feature/transfer-adapter-options
    weierophinney committed Feb 22, 2011
  5. Merge branch 'stream_resolve_include_path' of https://github.com/marc…

    …-mabe/zf2 into hotfix/marc-mabe-stream_resolve
    weierophinney committed Feb 22, 2011
  6. Merge branch 'ZF-10190' of https://github.com/marc-mabe/zf2 into hotf…

    …ix/marc-mabe-zf-10190
    weierophinney committed Feb 22, 2011
  7. Merge branch 'ZF-10835' of https://github.com/thomasweidner/zf2 into …

    …hotfix/thomasweider-zf-10835
    weierophinney committed Feb 22, 2011
  8. Merge branch 'ZF-10822' of https://github.com/thomasweidner/zf2 into …

    …hotfix/thomasweider-zf-10822
    weierophinney committed Feb 22, 2011
  9. Merge branch 'ZF-6768' of https://github.com/thomasweidner/zf2 into h…

    …otfix/thomasweider-zf-6768
    weierophinney committed Feb 22, 2011
Commits on Feb 16, 2011
  1. [ZF-11055] DOCUMENTATION

    - added missing reference
    thomasweidner committed Feb 16, 2011
  2. [ZF-10962] Zend_Translator

    - removing old BC code
    thomasweidner committed Feb 16, 2011
  3. [GENERIC_2]

    - simplified caching
    thomasweidner committed Feb 16, 2011
  4. [Zend_Locale]

    - preparation for number localization
    thomasweidner committed Feb 16, 2011
Commits on Feb 10, 2011
  1. - Remove code that generare fatal erros from test

    - Mark tests as skiped where resource does not support new plugins engine
    Andrey Korolyov committed Feb 10, 2011
Commits on Feb 7, 2011
Commits on Feb 6, 2011
  1. [Locale]

    - added variant
    - added Intl data
    thomasweidner committed Feb 6, 2011