summaryrefslogtreecommitdiffstats
path: root/user_guide_src
AgeCommit message (Collapse)AuthorFilesLines
2012-03-12Merge upstream branchAndrey Andreev1-2/+2
2012-03-12DocTaufan Aditya1-2/+2
2012-03-12Update the list of supported databasesAndrey Andreev1-2/+2
2012-03-12Postgres to PostgreSQLAndrey Andreev2-8/+8
2012-03-12Merge upstream branchAndrey Andreev3-2/+15
2012-03-12Merge pull request #1078 from mikedfunk/feature/table_configAndrey Andreev2-0/+3
Ability to use a configuration file for the Table class
2012-03-12Remove collation parameter from db_set_charset() (no longer needed)Andrey Andreev1-1/+3
2012-03-12merged latest develop branch.Mike Funk7-11/+34
2012-03-12merged with latest develop.Mike Funk2-1/+8
2012-03-12Postgre to PostgresAndrey Andreev1-1/+1
2012-03-12Path helper improvementTaufan Aditya2-4/+8
2012-03-12Merge pull request #1079 from mikedfunk/feature/form_val_configAndrey Andreev2-1/+8
Feature/form val config error_prefix and error_suffix
2012-03-12Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Mike Funk7-10/+26
feature/all_flashdata
2012-03-12updated docs & changelogRoger Herbert2-5/+9
2012-03-12form_dropdown() will now also take an array for unity with other form helpers.nihaopaul1-0/+1
2012-03-12Merge upstream branchAndrey Andreev5-7/+9
2012-03-11Added an Android <= 2.1 specific check to force_download()Andrey Andreev1-0/+1
2012-03-10Remove PHP 5.1.6-specific codeAndrey Andreev1-1/+1
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon4-9/+30
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon5-5/+6
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-03-09Merge upstream branchAndrey Andreev6-41/+125
2012-03-09Merge upstream branchAndrey Andreev5-10/+46
2012-03-09Merge upstream branchAndrey Andreev6-41/+125
2012-03-09Merge upstream branchAndrey Andreev6-41/+125
2012-03-08Fix documentation entry for the decimal form validation rule (issue #1149)Andrey Andreev1-1/+1
2012-03-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Mike Funk2-3/+16
feature/form_val_config
2012-03-08Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow3-8/+27
2012-03-08Fix issue #940Andrey Andreev1-0/+1
2012-03-07Fix issue #501Andrey Andreev1-0/+1
2012-03-07userguide fixMichiel Vugteveen1-1/+1
2012-03-07removed is_methodMichiel Vugteveen2-21/+5
2012-03-07Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Mike Funk1-5/+11
feature/all_flashdata
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
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
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
Signed-off-by: Hamza Bhatti <tiyowan@gmail.com>
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