Permalink
Commits on Feb 14, 2012
  1. Merge pull request #796 from DragonBe/hotfix/ZF2-165

    Fixing issue ZF2-165 with updated PHPUnit version
    akrabat committed Feb 14, 2012
Commits on Feb 13, 2012
  1. Merge pull request #792 from RWOverdijk/docs/ZF2-163

    Made exception messages more accurate
    akrabat committed Feb 13, 2012
Commits on Feb 10, 2012
  1. Fix bug where priority was not passed to wrapping part route

    When passing a priority for a route which has child routes (part route), it
    was not passing the priority along to the wrapping part route. Worked with
    @DASPRiD to debug and test this.
    EvanDotPro committed Feb 10, 2012
Commits on Feb 9, 2012
  1. Merge branch 'hotfix/documentation' of https://github.com/mikaelkael/zf2

     into hotfix/documentation
    weierophinney committed Feb 9, 2012
  2. Added filters, enrichments and paginations

    Conflicts:
    
    	library/Zend/Service/AgileZen/AgileZen.php
    	library/Zend/Service/AgileZen/Resources/Invite.php
    	library/Zend/Service/AgileZen/Resources/Story.php
    ezimuel committed with weierophinney Feb 7, 2012
  3. Merge branch 'cache_fixes' of https://github.com/marc-mabe/zf2 into h…

    …otfix/cache-options-improvements
    weierophinney committed Feb 9, 2012
  4. Merge branch 'fix-double-encoding-problem-about-cookie-value' of http…

    …s://github.com/hnw/zf2 into hotfix/http-cookie-encoding
    
    Conflicts:
    	library/Zend/Http/Client.php
    weierophinney committed Feb 9, 2012
  5. Merge branch 'AssignmentHasNoAffect' of https://github.com/marc-mabe/zf2

     into hotfix/application-redundant-assignment
    weierophinney committed Feb 9, 2012
  6. Merge branch 'fix-ldap-filter' of https://github.com/sgehrig/zf2 into…

    … hotfix/ldap-filter-import
    weierophinney committed Feb 9, 2012
  7. Minor CS change

    - Align assignments
    weierophinney committed Feb 9, 2012
  8. Merge branch 'mvc-router-from-locator' of https://github.com/Ocramius…

    …/zf2 into feature/router-from-locator
    weierophinney committed Feb 9, 2012
  9. Merge branch 'patch-5' of https://github.com/mishak87/zf2 into hotfix…

    …/form-exception-namespace
    weierophinney committed Feb 9, 2012
  10. Merge branch 'bugfix-gdata_youtube' of https://github.com/cgdangelo/zf2

    … into hotfix/gdata-http-client
    weierophinney committed Feb 9, 2012
Commits on Feb 7, 2012
Commits on Feb 5, 2012
  1. added missing ArrayObject

    marc-mabe committed Feb 5, 2012
  2. Assignment in condition

    marc-mabe committed Feb 5, 2012
  3. removed type check of options on setOptions because it will already d…

    …one by the constructor of Zend\Stdlib\Options
    marc-mabe committed Feb 5, 2012
  4. removed not needed @

    marc-mabe committed Feb 5, 2012
  5. added missing 'new'

    marc-mabe committed Feb 5, 2012