summaryrefslogtreecommitdiffstats
path: root/user_guide_src
AgeCommit message (Expand)AuthorFilesLines
2012-03-07merged latest develop branch, fixed changelog conflict.Mike Funk8-46/+194
2012-03-07merged from develop, fixed conflict in user guide.Mike Funk8-46/+194
2012-03-07added method() and is_method()Michiel Vugteveen2-3/+30
2012-03-07Update the example on extending libraries with a constructorAndrey Andreev1-5/+11
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow7-41/+182
2012-03-06updated and merged user guide with develop branch.Mike Funk8-41/+190
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev1-0/+1
2012-03-06Changed rewrite_short_tags to have no effect on PHP 5.4Andrey Andreev1-0/+1
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-0/+2
2012-03-06Removed reset_validation() method from run() methodJonoB2-0/+12
2012-03-06Fixed a bug in CI_Session::_unserialize()Andrey Andreev1-0/+1
2012-03-06Updated changelogSammyK1-0/+1
2012-03-05Moved change log entry from 2.1.1 to 3.0.Phil Sturgeon1-1/+1
2012-03-05Add changelog entry (bug fix for issue #64)Hamza Bhatti1-0/+1
2012-03-05Fixed note in documentationTimothy Warren1-1/+1
2012-03-05Merge upstream branchAndrey Andreev1-9/+7
2012-03-05Add a note to the num_rows() documentationAndrey Andreev1-2/+7
2012-03-05Rename property _commit to commit_mode and merge upstream changesAndrey Andreev6-43/+116
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to DB_...Andrey Andreev1-0/+2
2012-03-05Partially fix issue #306Andrey Andreev1-0/+1
2012-03-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-issue-499Andrey Andreev3-31/+70
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developJohn Crepezzi8-11/+138
2012-03-04Fix indentation for changes from pull #1121Andrey Andreev1-9/+9
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-3/+33
2012-03-04Updated with 2.1-stable.Phil Sturgeon1-0/+2
2012-03-04Allow users to specify an array for validation, instead of alway using the $_...JonoB2-3/+33
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon6-12/+64
2012-03-04Merged conflicts.Phil Sturgeon1-0/+1
2012-03-03Just a grammar fix. Changed "...as the code these file contain will be minimi...Brenderous1-1/+1
2012-03-03Merge upstream branchAndrey Andreev4-7/+37
2012-03-03Merge upstream branchAndrey Andreev4-7/+37
2012-03-03Merge upstream branchAndrey Andreev4-7/+37
2012-03-03Merge upstream branchAndrey Andreev1-1/+4
2012-03-03Added _optimize_table() support for PostgreSQLAndrey Andreev1-2/+4
2012-03-03Add db_set_charset() support for PostgreSQL and change its implementation for...Andrey Andreev1-0/+1
2012-03-03Merge upstream branchAndrey Andreev5-8/+48
2012-03-03Improve DB version() implementation and add pg_version() supportAndrey Andreev1-0/+2
2012-03-02Merge pull request #1107 from diogoosorio/developAndrey Andreev1-0/+1
2012-03-02Made the code more readable, updated the changelog.Diogo Osório1-0/+1
2012-03-02Updated changelogTimothy Warren1-0/+1
2012-03-02Merge upstreamTimothy Warren3-4/+35
2012-03-02Replaced DB methods _error_message() and _error_number() with error() (issue ...Andrey Andreev2-3/+21
2012-03-02Merge upstream branchAndrey Andreev2-0/+12
2012-03-02Merge upstream branchAndrey Andreev2-0/+12
2012-03-02Merge upstream branchAndrey Andreev2-0/+12
2012-03-02Merge upstream branchAndrey Andreev2-1/+12
2012-03-02Fix a bug in Oracle's DB forge _create_table() method (AUTO_INCREMENT is not ...Andrey Andreev1-0/+1
2012-03-02Fix issue #1101 (MySQL/MySQLi result field_data())Andrey Andreev1-0/+1
2012-03-02updated error_array #565Michiel Vugteveen2-0/+10
2012-03-02Merge upstream branchAndrey Andreev1-0/+1