summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow56-1425/+2755
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
2012-03-06Move dsn property from the PDO to CI_DB_driver so other DB drivers can use ↵Andrey Andreev2-2/+2
it without declaring it
2012-03-06Just some comment fixes and cleared spacesAndrey Andreev1-33/+27
2012-03-06Property visibility declarations for CI_DB_driverAndrey Andreev1-40/+35
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev23-162/+124
2012-03-06Merge pull request #1138 from timw4mail/developAndrey Andreev1-70/+41
Added visibility keywords to DB_driver methods
2012-03-06Made _protect_identifiers publicTimothy Warren1-1/+4
2012-03-06Made protect_identifiers publicTimothy Warren1-1/+1
2012-03-06Added visibility keywords to DB_driver methodsTimothy Warren1-70/+38
2012-03-06Merge pull request #1137 from JonoB/developPhil Sturgeon0-0/+0
Removed reset_validation() method from run() method
2012-03-06Changed rewrite_short_tags to have no effect on PHP 5.4Andrey Andreev2-1/+2
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon4-13/+44
2012-03-06Removed reset_validation() method from run() methodJonoB3-4/+17
2012-03-06Fixed a bug in CI_Session::_unserialize()Andrey Andreev2-4/+7
2012-03-06Fix issue #1125 ... for realAndrey Andreev1-0/+35
2012-03-06Merge pull request #1133 from SammyK/developAndrey Andreev2-9/+2
Fixed bug for PostgreSQL driver where limit() & order_by() throws error
2012-03-06Updated changelogSammyK1-0/+1
2012-03-05Removed order_by() from PostgreSQL driver too.SammyK1-9/+1
2012-03-05Fixed bug for PostgreSQL driver where setting a limit() on update() or ↵SammyK1-2/+2
delete() would throw a syntax error from Postgres.
2012-03-05Moved change log entry from 2.1.1 to 3.0.Phil Sturgeon1-1/+1
2012-03-05Merge pull request #1131 from tiyowan/developPhil Sturgeon2-1/+2
Fix issue #64
2012-03-05Add changelog entry (bug fix for issue #64)Hamza Bhatti1-0/+1
Signed-off-by: Hamza Bhatti <tiyowan@gmail.com>
2012-03-05Fix issue #64Hamza Bhatti1-1/+1
Modify regular expression to be able to handle SQL bracket delimiters for column names that contain special characters or SQL keywords. Signed-off-by: Hamza Bhatti <tiyowan@gmail.com>
2012-03-05Merge pull request #1130 from timw4mail/developAndrey Andreev1-1/+1
Fixed note in documentation
2012-03-05Fixed note in documentationTimothy Warren1-1/+1
2012-03-05Add a note to the num_rows() documentationAndrey Andreev1-2/+7
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to ↵Andrey Andreev4-23/+22
DB_result to handle initialization
2012-03-05Partially fix issue #306Andrey Andreev2-4/+4
2012-03-05Fix issue #1125Andrey Andreev1-1/+35
2012-03-05Merge pull request #1087 from narfbg/develop-issue-499Andrey Andreev2-19/+21
Fix issue #499
2012-03-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-issue-499Andrey Andreev11-109/+261
2012-03-05Removed reset_validation() method from run() methodJonoB3-4/+17
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developJohn Crepezzi56-1504/+2940
2012-03-04Fix indentation for changes from pull #1121Andrey Andreev2-34/+33
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-15/+88
2012-03-04Updated with 2.1-stable.Phil Sturgeon2-19/+17
2012-03-04Merge pull request #1116 from tubalmartin/helpers|url|2.1-stablePhil Sturgeon3-23/+24
2.1 stable - An improved url_title helper function
2012-03-04Changelog updatedtubalmartin1-1/+1
2012-03-04User guide updatedtubalmartin1-3/+3
2012-03-04Allow developers to use any string as a separator, not just dashes or ↵tubalmartin1-10/+19
underscores. Backwards compatible when using 'dash' or 'underscore' as string separator. Tests: http://codepad.org/DWcxVH5r
2012-03-04Merge pull request #1121 from JonoB/developPhil Sturgeon3-15/+88
Allow users to specify an array for validation Now any data can be used, instead of always using $_POST.
2012-03-04Allow users to specify an array for validation, instead of alway using the ↵JonoB3-15/+88
$_POST array
2012-03-04Fixed conflicts.Phil Sturgeon1-3/+2
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon38-913/+1976
2012-03-04Merged conflicts.Phil Sturgeon3-8/+9
2012-03-04Merge pull request #1117 from tubalmartin/Upload|library|2.1-stablePhil Sturgeon1-1/+1
2.1 stable - CI_Upload::_file_mime_type() could've failed if popen() is used for the detection.
2012-03-04Removed changelog entrytubalmartin1-1/+0
2012-03-03Fixed a bug - CI_Upload::_file_mime_type() could've failed if popen() is ↵tubalmartin2-1/+2
used for the detection.
2012-03-03An even better url_title helper. Tests: http://codepad.org/tuJgvkyNtubalmartin2-20/+12
Changelog entry added for 2.1.1
2012-03-03Fix MySQL/MySQLi field_data()Andrey Andreev2-12/+50
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-07 00:47:39 +0100