Permalink
Commits on Oct 9, 2012
  1. Merge branch 'hotfix/2716'

    weierophinney committed Oct 9, 2012
    Close #2716
  2. [#2716] Fix form image captcha test

    weierophinney committed Oct 9, 2012
    - tearDown() was referencing an invalid property, leading to errors.
  3. Add test

    bakura10 committed Oct 9, 2012
Commits on Oct 8, 2012
  1. Merge branch 'hotfix/2700'

    weierophinney committed Oct 8, 2012
    Close #2700
  2. Merge branch 'hotfix/2699'

    weierophinney committed Oct 8, 2012
    Close #2699
  3. [#2699] Only run php-cs-fixer on bin, library, and tests

    weierophinney committed Oct 8, 2012
    - demos directory contains some embedded javascript code that php-cs-fixer does
      not like
  4. Merge branch 'hotfix/2698'

    weierophinney committed Oct 8, 2012
    Close #2698
  5. Merge branch 'hotfix/2687'

    weierophinney committed Oct 8, 2012
    Close #2687
  6. Merge branch 'hotfix/2686'

    weierophinney committed Oct 8, 2012
    Close #2686
    Close #2626
  7. Merge branch 'hotfix/2685'

    weierophinney committed Oct 8, 2012
    Close #2685
  8. Merge branch 'hotfix/unused-uses' of https://github.com/protecinnovat…

    weierophinney committed Oct 8, 2012
    …ions/zf2 into hotfix/2685
    
    Conflicts:
    	library/Zend/Db/TableGateway/Feature/EventFeature.php
    	tests/ZendTest/Cache/Storage/Adapter/CommonAdapterTest.php
  9. Merge branch 'hotfix/2681'

    weierophinney committed Oct 8, 2012
    Close #2681
  10. Merge branch 'hotfix/2680'

    weierophinney committed Oct 8, 2012
    Close #2680
  11. Merge branch 'hotfix/2688'

    weierophinney committed Oct 8, 2012
    Close #2688
  12. [#2688] CS fixes

    weierophinney committed Oct 8, 2012
    - explicitly implement EventsCapableInterface (already implemented by
      defining getEventManager())
    - docblocks for all methods in EventFeature
    - class and file docblocks for EventFeatureTest
  13. fix cs in casting variable

    samsonasik committed Oct 8, 2012
Commits on Oct 7, 2012
  1. fix elseif in javascript

    samsonasik committed Oct 7, 2012
  2. Ajust to rerun travis build

    Lansoweb committed Oct 7, 2012
    The rpevius build failed for php 5.4 for unknown reason (internal
    error?)
Commits on Oct 6, 2012
Commits on Oct 5, 2012
  1. Merge branch 'hotfix/console-404-reporting' of git://github.com/weier…

    ralphschindler committed Oct 5, 2012
    …ophinney/zf2 into weierophinney-hotfix/console-404-reporting