summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-07-13Merge pull request #1616 from appleboy/pageAndrey Andreev1-2/+2
2012-07-13fix issue #1605 covert page number type from float to intBo-Yi Wu1-2/+2
2012-07-13Rename $babe => $single_model, in foreach ($model AS $babe) {...}joellimberg1-2/+2
2012-07-13escape_identifiers() to not escape string literals inside double quotes as wellAndrey Andreev1-1/+1
2012-07-13Fix issue #1613Andrey Andreev2-1/+7
2012-07-12Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon18-42/+38
2012-07-12Added data-ci-pagination-page="x" to pagination output so JS frameworks can h...Phil Sturgeon1-7/+27
2012-07-12Merge pull request #1609 from vkeranov/developPhil Sturgeon12-22/+13
2012-07-12Update developvkeranov1-1/+0
2012-07-12Update developvkeranov1-1/+0
2012-07-12Fix some spaces herevkeranov1-6/+5
2012-07-12again... new linesvkeranov1-1/+0
2012-07-12Too many new lines here :)vkeranov1-2/+1
2012-07-12Cleaning againvkeranov1-4/+3
2012-07-12Cleaning...vkeranov1-1/+0
2012-07-12Cleaning time...vkeranov1-1/+0
2012-07-12Important space fix :)vkeranov1-1/+1
2012-07-12Wrong url againvkeranov1-1/+1
2012-07-12Another typo...vkeranov1-1/+1
2012-07-12Fixed typo in the commentsvkeranov1-2/+1
2012-07-11Merge pull request #1607 from vlakoff/developPhil Sturgeon1-1/+1
2012-07-11Fix a typo in Common.phpvlakoff1-1/+1
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
2012-07-11Revert "Testing push. Will revert."Eric Roberts1-1/+1
2012-07-11Testing push. Will revert.Eric Roberts1-1/+1
2012-07-11Fixing typo in error for multiple migration conflict.lee Tengum1-1/+1
2012-07-10Reconnect to PostgreSQL database if connection droped.rwillert1-1/+9
2012-07-10Follow-up to #1398, #1548Andrey Andreev2-2/+6
2012-07-10Merge pull request #1398 from gintsmurans/developAndrey Andreev1-14/+15
2012-07-10Merge pull request #1548 from chrisguiney/error_reportingAndrey Andreev2-1/+3
2012-07-09Remove _drop_database property from CI_DB_odbc_forge and CI_DB_pdo_forge (it ...Andrey Andreev2-2/+0
2012-07-08Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_sub...Andrey Andreev19-55/+164
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
2012-07-07missing '$this->' causing custom result objects to return as null/empty array...Jon Ellis-Jones1-1/+1
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
2012-07-06_fetch_object(), custom_result_object() to utilize PHP's native capability to...Andrey Andreev13-46/+123
2012-07-06t commit -s 'Added info about set_*() functions and form_validation class inaditya1-0/+4
2012-07-05Replace localhost with 127.0.0.1 and remove the PDO::ERRMODE_SILENT option - ...Andrey Andreev10-10/+9
2012-07-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_sub...Andrey Andreev2-7/+35
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