Permalink
Commits on Aug 6, 2014
  1. Merge branch 'adamlundrigan-hotfix/6209'

    Mike Willbanks
    Mike Willbanks committed Aug 6, 2014
    Close #6209 #6469
  2. Merge branch 'hotfix/6209' of github.com:adamlundrigan/zf2 into adaml…

    Mike Willbanks
    Mike Willbanks committed Aug 6, 2014
    …undrigan-hotfix/6209
  3. PHPCS Fixes for Zend\Authentication

    chadicus authored and Ocramius committed Jul 13, 2014
  4. Merge branch 'samsonasik-fix/viewname'

    Mike Willbanks
    Mike Willbanks committed Aug 6, 2014
    Close #6470 #6467
  5. Merge branch 'fix/viewname' of github.com:samsonasik/zf2 into samsona…

    Mike Willbanks
    Mike Willbanks committed Aug 6, 2014
    …sik-fix/viewname
  6. Fix: Undefined field

    localheinz authored and Ocramius committed Jul 22, 2014
  7. Fixes #6506 - as of zendframework/zendframework@eaa7874, `zendframew…

    Ocramius committed Aug 6, 2014
    …ork/zend-form` is required in the MVC
Commits on Aug 4, 2014
  1. Ignore some files/paths when running CS checks

    weierophinney committed Aug 4, 2014
    - Recent changes to php-cs-fixer (see
      https://github.com/fabpot/PHP-CS-Fixer/issues/422) have led to errors being
      raised that should not. This change to the php-cs-fixer configuration places
      several new paths into the "do not test" list. They will be re-instated when
      the issues are fixed.
  2. Merge branch 'hotfix/6510'

    weierophinney committed Aug 4, 2014
    Close #6510
  3. [#6510] Fix test setup

    weierophinney committed Aug 4, 2014
    - Moved declaration of driver options into `setUp()` so that we can know
      constants are declared before we attempt to assign their values.
  4. Merge pull request #6510 from clarkphp/fix-6428

    weierophinney committed Aug 4, 2014
    Fix 6428 - authenticate() always fails on IBMi when using DB table-based authentication
Commits on Aug 2, 2014
  1. Correct a PSR-2 Code Style error I had missed before issuing PR.

    clarkphp committed Aug 2, 2014
    Reword a few comments.
Commits on Aug 1, 2014
  1. ZF-6428: authenticate() always fails on IBMi when using DB table-based

    clarkphp committed Aug 1, 2014
    authentication.
    
    Ensure that a lowercased zend_auth_credential_match element exists in
    $resultIdentities array when the array is created.
    Add Unit Tests specific to IBMi DB2 for CredentialTreatmentAdapter
    logic.
    Add TestConfiguration constants to control the unit tests.
Commits on Jul 28, 2014
  1. Remove trailing whitespaces

    rahuldroy authored and Ocramius committed Jul 28, 2014
    Conflicts:
    	library/Zend/Cache/Storage/Adapter/Redis.php
    	library/Zend/Crypt/FileCipher.php
    	tests/ZendTest/Crypt/FileCipherTest.php
    	tests/ZendTest/Crypt/Symmetric/Padding/NoPaddingTest.php
  2. move logic into __construct

    samsonasik authored and Ocramius committed Jun 14, 2014
  3. change == to ===

    samsonasik authored and Ocramius committed Jun 10, 2014
  4. Fixes #6281

    samsonasik authored and Ocramius committed Jun 9, 2014
  5. update de translation header

    Stefano Azzalini authored and Ocramius committed Jun 4, 2014
  6. Fix stupidly slipped in character... this can really only happen ony …

    DASPRiD authored and Ocramius committed May 28, 2014
    …german keyboard layout