summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-07-11Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developEric Roberts78-1835/+4030
2012-07-11Merge pull request #1604 from thatleeguy/developPhil Sturgeon1-1/+1
Fixing typo in error for multiple migration conflict.
2012-07-11Revert "Testing push. Will revert."Eric Roberts1-1/+1
This reverts commit cccd07509ee3c924e0172e8bff216acef0aa9f86.
2012-07-11Testing push. Will revert.Eric Roberts1-1/+1
2012-07-11Fixing typo in error for multiple migration conflict.lee Tengum1-1/+1
Signed-off-by: lee Tengum <lee@thatleeguy.com>
2012-07-10Follow-up to #1398, #1548Andrey Andreev2-2/+6
2012-07-10Merge pull request #1398 from gintsmurans/developAndrey Andreev1-14/+15
Change error_reporting(0) to ini_set('display_errors', 0);
2012-07-10Merge pull request #1548 from chrisguiney/error_reportingAndrey Andreev2-1/+3
Respect display_errors when deciding if to display an error...
2012-07-09Remove _drop_database property from CI_DB_odbc_forge and CI_DB_pdo_forge (it ↵Andrey Andreev2-2/+0
has the same default in CI_DB_forge)
2012-07-08Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Andrey Andreev19-55/+164
feature/db_subdrivers
2012-07-08Fix issue #1591Andrey Andreev1-1/+1
2012-07-08#1558Andrey Andreev2-0/+7
2012-07-07Merge pull request #1587 from jonnu/broken-croAndrey Andreev1-1/+1
missing '$this->' causing custom result objects to return as null/empty ...
2012-07-07missing '$this->' causing custom result objects to return as null/empty ↵Jon Ellis-Jones1-1/+1
arrays for ->row() and ->result() methods.
2012-07-06Fix a join() test ... dohAndrey Andreev1-1/+1
2012-07-06Fix a few join() bugsAndrey Andreev4-8/+29
2012-07-06Merge pull request #1581 from adityamenon/developPhil Sturgeon1-0/+4
Added info about set_*() functions and form_validation class in the Form Helper documentation.
2012-07-06_fetch_object(), custom_result_object() to utilize PHP's native capability ↵Andrey Andreev13-46/+123
to directly return custom class results
2012-07-06t commit -s 'Added info about set_*() functions and form_validation class inaditya1-0/+4
the Form Helper documentation.' Signed-off-by: aditya <adityamenon90@gmail.com>
2012-07-05Replace localhost with 127.0.0.1 and remove the PDO::ERRMODE_SILENT option - ↵Andrey Andreev10-10/+9
it's the default anyway
2012-07-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Andrey Andreev2-7/+35
feature/db_subdrivers
2012-07-05Fix PDO version()Andrey Andreev1-3/+14
2012-07-05Apparently mysql_data_seek() causes problems even when we suppress and ignore itAndrey Andreev1-4/+21
2012-07-05Merge upstream branchAndrey Andreev60-1596/+975
2012-07-05Fix pdo_result num_rows() for subdrivers that don't support rowCount()Andrey Andreev1-2/+2
2012-07-05Add a default _count_string propertyAndrey Andreev12-67/+8
2012-07-05Fix a typoAndrey Andreev1-1/+1
2012-07-05Clean-up the separate drivers' DB result classes from no longer needed methodsAndrey Andreev14-1167/+67
2012-07-05Optimize custom_result_object()Andrey Andreev1-4/+5
2012-07-05Merge pull request #1576 from Dumk0/patch-6Phil Sturgeon1-1/+1
improvement for latest migration id calculation
2012-07-05Don't fetch DB result sets twiceAndrey Andreev1-16/+59
2012-07-05Suppress mysql_data_seek()'s ambiguous E_WARNING messagesAndrey Andreev1-1/+1
2012-07-05Change DB_result::num_rows default value to NULLAndrey Andreev5-27/+60
2012-07-05Rename the 'interbase' DB driver to 'ibase' in order to match PHP's function ↵Andrey Andreev7-16/+17
prefix
2012-07-05Move _insert() and _update() defaults from Query Builder to DB_driver so ↵Andrey Andreev3-59/+67
that they're available for use by insert_string() and update_string() at all times
2012-07-05Merge pull request #1577 from rebizu/developAndrey Andreev2-1/+17
I added so the DB.php is aware of database config files in packages.
2012-07-05code cleanup and changelog addedRene Brokholm2-13/+14
2012-07-05Merge pull request #1575 from Dumk0/patch-5Andrey Andreev1-2/+2
Fixed annotation for CI_Migration->find_migrations() method
2012-07-05I added so the DB.php is aware of database config files in packages.Rene Brokholm1-1/+16
This way if a package is containing a database.php file in its config folder this will be parset alongside the aplication/config/database.php file.
2012-07-05added space after (int)Dumk01-1/+1
2012-07-05improvement for latest migration id calculationDumk01-1/+1
2012-07-05Fixed annotation for CI_Migration->find_migrations() methodDumk01-2/+2
2012-07-04Create aliases for odbc_fetch_array() and odbc_fetch_object() instead of ↵Andrey Andreev1-62/+68
using custom methods Signed-off-by: Andrey Andreev <narf@bofh.bg>
2012-07-04Add PDO support for list_fields()Andrey Andreev2-3/+6
Signed-off-by: Andrey Andreev <narf@bofh.bg>
2012-07-04updated the changelog, fixed some whitespaceChristopher Guiney2-1/+2
2012-07-04Merge branch 'feature/user-guide-work' into developDerek Jones12-8/+217
Conflicts: user_guide_src/source/installation/upgrade_210.rst user_guide_src/source/installation/upgrade_211.rst user_guide_src/source/installation/upgrade_212.rst
2012-07-04added general/welcome to the toctreeDerek Jones1-0/+1
2012-07-04Fixed a change log formatting issue and doc referenceDerek Jones1-1/+2
2012-07-04Fix URL helper linkDerek Jones1-1/+1
2012-07-04Fixing upgrade file referencesDerek Jones4-10/+44
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-31 19:51:28 +0100