Permalink
Commits on Jun 29, 2012
  1. Merge branch 'hotfix/2.1.2'

    wesbaker committed Jun 29, 2012
  2. Updating XSS cleaning to better handle base64 encoded attributes.

    Conflicts:
    	system/core/Security.php
    wesbaker committed Apr 24, 2012
Commits on Jun 13, 2012
  1. Revert a preg_replace()

    narfbg committed Jun 13, 2012
  2. Switch strstr() arguments

    narfbg committed Jun 13, 2012
  3. Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1

    Phil Sturgeon committed Jun 13, 2012
Commits on Jun 11, 2012
  1. Fixed conflicts

    Why were there conflicts merging into master?
    Phil Sturgeon committed Jun 11, 2012
Commits on Jun 7, 2012
  1. Revert a change

    narfbg committed Jun 7, 2012
  2. Fixed valid_ip() for PHP < 5.2

    narfbg committed Jun 7, 2012
Commits on May 27, 2012
  1. Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1…

    …-stable
    Phil Sturgeon committed May 27, 2012
  2. Fix an erroneus method name

    narfbg committed May 27, 2012
Commits on May 24, 2012
  1. Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1…

    …-stable
    Phil Sturgeon committed May 24, 2012
  2. Stop travis trying to run unit tests on 2.1-stable.

    Phil Sturgeon committed May 24, 2012
  3. Fix issue #1387

    narfbg committed May 24, 2012
  4. Merge pull request #1389 from jamiefdhurst/2.1-stable

    Adding width and height to list of clear variables to fix #1059
    Phil Sturgeon committed May 24, 2012
Commits on May 23, 2012
  1. Added ability to _like paramater side to use 'none', in case one want…

    …s to query like instead of where without case being sensitive
    chonthu committed with Phil Sturgeon Aug 21, 2011
Commits on May 20, 2012
  1. Merge pull request #1331 from rogeriopradoj/patch-1

    Workaround for PDO Driver in 2.1-stable: num_rows doesn't work for SELECT queries
    Phil Sturgeon committed May 20, 2012
Commits on May 19, 2012
  1. Fix a issue with CI_DB_pdo_result::num_rows()

    In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit
    makes it returns the expected value.
    rogeriopradoj committed May 19, 2012
  2. Fix a issue with affect_rows in CI_DB_pdo_driver::_execute()

    In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit
    makes affect_rows be initialized properly.
    
    Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
    rogeriopradoj committed May 19, 2012
  3. Fix issue #726

    narfbg committed May 19, 2012
Commits on May 17, 2012
  1. Merge branch 'release/2.1.1'

    Phil Sturgeon committed May 17, 2012
  2. Added upgrade for 2.1.1 and updated version.

    Phil Sturgeon committed May 17, 2012
  3. Merge pull request #1366 from aphofstede/2.1-stable

    Check cookie against md5 regex. 2.1 stable CSRF injection security fix
    narfbg committed May 17, 2012
  4. Use tabs for indenting

    Alexander Hofstede committed May 17, 2012
  5. Revert "Use tab for indent"

    This reverts commit c3eb672.
    Alexander Hofstede committed May 17, 2012