Permalink
Commits on Apr 28, 2012
  1. Merge

    jcc2010 committed Apr 28, 2012
  2. Merge pull request #1302 from chrisberthe/important_spelling_fix

    Phil Sturgeon committed Apr 28, 2012
    Important spelling fix to CodeIgniter.php
Commits on Apr 27, 2012
  1. Merge pull request #1299 from timw4mail/patch

    Phil Sturgeon committed Apr 27, 2012
    Fix helper docblocks
  2. Fix docblocks A-H

    timw4mail committed Apr 27, 2012
  3. Merge pull request #1296 from timw4mail/library-cleanup

    Phil Sturgeon committed Apr 27, 2012
    Library cleanup - adding additional docblocks
  4. Merge pull request #1298 from zivyuan/patch-1

    Phil Sturgeon committed Apr 27, 2012
    Cookie $index should start with a prefix.
  5. Merge pull request #993 from narfbg/develop-issue-128

    narfbg committed Apr 27, 2012
    Fix issue #128
  6. Merge upstream branch

    narfbg committed Apr 27, 2012
  7. Update system/core/Input.php

    zivyuan committed Apr 27, 2012
    Fix a cookie get back problem. Cookie $index should start with a prefix.
Commits on Apr 26, 2012
  1. Fix Table library docblocks

    timw4mail committed Apr 26, 2012
  2. Merge pull request #981 from narfbg/develop-db-postgre

    Phil Sturgeon committed Apr 26, 2012
    Improve the PostgreSQL database driver
  3. Merge pull request #979 from narfbg/develop-db-cubrid

    Phil Sturgeon committed Apr 26, 2012
    Improve the CUBRID database driver
  4. Merge pull request #1266 from timw4mail/patch

    Phil Sturgeon committed Apr 26, 2012
    Normalize comments in core files
  5. Merge pull request #1004 from kwaanonline/develop

    Phil Sturgeon committed Apr 26, 2012
    Date Helper documentation update
  6. Merge pull request #1262 from Korri/develop

    Phil Sturgeon committed Apr 26, 2012
    Fix Issue #627
  7. Fixed conflicts.

    Phil Sturgeon committed Apr 26, 2012
  8. Fixed issue #122 - ruri_string() in subdirs.

    Phil Sturgeon committed Apr 26, 2012
  9. Merge pull request #1061 from jamierumbelow/develop

    Phil Sturgeon committed Apr 26, 2012
    Renamed Active Record class to Query Builder
  10. Merge pull request #1294 from toopay/pdo-patch

    Phil Sturgeon committed Apr 26, 2012
    Hotfix PDO
  11. PDO patch and run the test

    toopay committed Apr 26, 2012
  12. Merge pull request #1246 from toopay/db-tests

    Phil Sturgeon committed Apr 26, 2012
    Improved test coverage for Database.
  13. Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into …

    jamierumbelow committed Apr 26, 2012
    …develop
    
    Conflicts:
    	system/core/Loader.php
    	system/database/DB_query_builder.php
    	system/database/drivers/cubrid/cubrid_driver.php
    	system/database/drivers/mssql/mssql_driver.php
    	system/database/drivers/mysql/mysql_driver.php
    	system/database/drivers/mysqli/mysqli_driver.php
    	system/database/drivers/oci8/oci8_driver.php
    	system/database/drivers/odbc/odbc_driver.php
    	system/database/drivers/pdo/pdo_driver.php
    	system/database/drivers/postgre/postgre_driver.php
    	system/database/drivers/sqlite/sqlite_driver.php
    	user_guide_src/source/changelog.rst
    	user_guide_src/source/database/query_builder.rst