Permalink
Commits on Mar 2, 2012
  1. Removed debug code

    weierophinney committed Mar 2, 2012
  2. Remove union method for now

    - Implementation to come in future, and currently causing test failures
      due to undefined constant.
    weierophinney committed Mar 2, 2012
  3. Merge branch 'feature/db-clean' of https://github.com/ralphschindler/zf2

     into feature/db-rewrite
    
    Merged Ralph's feature/db-clean branch, containing the rewrite of Zend\Db
    
    Conflicts:
    	tests/Zend/Db/Statement/Db2Test.php
    	tests/Zend/Db/Statement/MysqliTest.php
    	tests/Zend/Db/Statement/OracleTest.php
    	tests/Zend/Db/Statement/PdoMysqlTest.php
    	tests/Zend/Db/Statement/PdoSqliteTest.php
    	tests/Zend/Db/Table/Relationships/AbstractTest.php
    	tests/Zend/Db/Table/Row/AbstractTest.php
    	tests/Zend/Db/Table/Rowset/AbstractTest.php
    	tests/Zend/Db/Table/Select/AbstractTest.php
    	tests/Zend/Db/Table/Select/StaticTest.php
    	tests/Zend/Db/Table/Table/AbstractTest.php
    	tests/Zend/Db/TestSetup.php
    weierophinney committed Mar 2, 2012
  4. Merge pull request #28 from weierophinney/feature/db-docs

    Merging weierophinney's docbook fixes for Zend\Db manual
    Ralph Schindler committed Mar 2, 2012
  5. Fixed parse/build errors in db docs

    - Also cleaned up some formatting
    weierophinney committed Mar 2, 2012
  6. Enabled DB docs in manual build

    - Also renamed Sql docs to be consistent naming with other Db docs
    weierophinney committed Mar 2, 2012
  7. Merge pull request #27 from weierophinney/feature/db-sql-docblocks

    Merging weierophinney's docblock additions for Zend\Db\Sql
    Ralph Schindler committed Mar 2, 2012
  8. Merge branch 'feature/db-clean' of github.com:ralphschindler/zf2 into…

    … feature/db-clean
    
    Conflicts:
    	library/Zend/Db/Adapter/ParameterContainer.php
    ralphschindler committed Mar 2, 2012
  9. Merge pull request #26 from ezimuel/feature/db-clean

    Merging docblock additions from ezimuel
    Ralph Schindler committed Mar 2, 2012
  10. Reviewed phpdoc of Zend\Db

    ezimuel committed Mar 2, 2012
  11. Merge pull request #874 from weierophinney/hotfix/docs-quickstart-beta3

    Updated MVC intro/quick start docs to beta3 usage
    Pádraic Brady committed Mar 2, 2012
  12. Fix a plural to a singular

    - s/views/view/
    weierophinney committed Mar 2, 2012
  13. Initial docs

    ralphschindler committed Mar 2, 2012
  14. Updated MVC intro/quick start docs to beta3 usage

    - Reference view models
    - No need for DI aliases of controllers any more
    weierophinney committed Mar 2, 2012
  15. Fixed caching setup in Paginator tests

    - Needed to ensure cache directory existed before using it
    weierophinney committed Mar 2, 2012
  16. [ZF2-145] Fixed readOnly tests for EntryLink

    - Had several incorrect assumptions
    weierophinney committed Mar 2, 2012
  17. Various small fixes

    ralphschindler committed Mar 2, 2012
  18. [ZF2-145] Fix Etag usage in GData\Feed

    - What you did
    weierophinney committed Mar 2, 2012