summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-04-27Merge upstream branchAndrey Andreev228-7839/+8046
2012-04-26Merge pull request #981 from narfbg/develop-db-postgrePhil Sturgeon2-81/+56
Improve the PostgreSQL database driver
2012-04-26Merge pull request #979 from narfbg/develop-db-cubridPhil Sturgeon4-166/+70
Improve the CUBRID database driver
2012-04-26Merge pull request #1266 from timw4mail/patchPhil Sturgeon17-402/+482
Normalize comments in core files
2012-04-26Merge pull request #1004 from kwaanonline/developPhil Sturgeon1-60/+92
Date Helper documentation update
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren60-370/+1061
2012-04-26Merge pull request #1262 from Korri/developPhil Sturgeon1-2/+2
Fix Issue #627
2012-04-26Fixed conflicts.Phil Sturgeon107-3380/+1766
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon3-3/+7
2012-04-26Merge pull request #1061 from jamierumbelow/developPhil Sturgeon31-331/+355
Renamed Active Record class to Query Builder
2012-04-26Merge pull request #1294 from toopay/pdo-patchPhil Sturgeon1-1/+1
Hotfix PDO
2012-04-26Remove temporary branch from travis whitelistTaufan Aditya1-2/+1
2012-04-26PDO patch and run the testTaufan Aditya2-2/+3
2012-04-26Merge pull request #1246 from toopay/db-testsPhil Sturgeon27-34/+697
Improved test coverage for Database.
2012-04-26A couple more documentation updatesJamie Rumbelow2-2/+2
2012-04-26Adding some update notes for 3.0.0 (renaming AR to QB)Jamie Rumbelow1-0/+10
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow231-7887/+10538
Conflicts: system/core/Loader.php system/database/DB_query_builder.php system/database/drivers/cubrid/cubrid_driver.php system/database/drivers/mssql/mssql_driver.php system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/oci8/oci8_driver.php system/database/drivers/odbc/odbc_driver.php system/database/drivers/pdo/pdo_driver.php system/database/drivers/postgre/postgre_driver.php system/database/drivers/sqlite/sqlite_driver.php user_guide_src/source/changelog.rst user_guide_src/source/database/query_builder.rst
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren4-32/+38
2012-04-26Merge pull request #1292 from ChadBH/developAndrey Andreev1-2/+2
Corrected path to jquery
2012-04-26Corrected path to jqueryChad Hedgcock1-2/+2
2012-04-25Merge pull request #1288 from petsagouris/Issue-131Andrey Andreev2-29/+35
Updated foreign_characters.php
2012-04-25Added foreign_characters.php changes in the changelog.George Petsagourakis1-0/+1
2012-04-25Merge pull request #1289 from st2/patch-2Andrey Andreev1-1/+1
Same Issue on #1238 at IIS System
2012-04-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren2-2/+2
2012-04-24Update system/helpers/file_helper.phpst21-1/+1
2012-04-24Add changelog entry for already fixed issue #23Andrey Andreev1-1/+1
2012-04-24Added Romanian characters to the foreign_chars.phpGeorge Petsagourakis1-4/+4
fixes #131
2012-04-24Added Greek characters to the foreign_chars.phpGeorge Petsagourakis1-28/+33
2012-04-24Merge pull request #1286 from st2/patch-1Phil Sturgeon1-1/+1
Fix Issue #1282 Update system/database/drivers/sqlsrv/sqlsrv_driver.php
2012-04-24Update system/database/drivers/sqlsrv/sqlsrv_driver.phpst21-1/+1
2012-04-23Use tabs to separate class propertiesTimothy Warren14-55/+54
2012-04-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren6-18/+20
2012-04-23Merge pull request #1278 from samxli/developPhil Sturgeon1-0/+3
Added fix for issue #1277
2012-04-23Tweak to comments to conform to style guide.Sam Li1-1/+1
2012-04-23Added fix for issue: https://github.com/EllisLab/CodeIgniter/issues/1277Sam Li1-0/+3
2012-04-23Merge upstreamTimothy Warren1-3/+1
2012-04-23Merge pull request #1271 from dixy/develop-microtimeAndrey Andreev2-11/+8
Use parameter 'get_as_float' of microtime()
2012-04-23Fix issue #1265Andrey Andreev2-8/+9
2012-04-23Merge pull request #1272 from king724/developPhil Sturgeon1-0/+1
Adding in .ics MIME type for calendar invites.
2012-04-21Use parameter 'get_as_float' of microtime()dixy2-11/+8
2012-04-20added suggested styleguide addition for future consistencyTimothy Warren1-1/+12
2012-04-19Fix syntax errorTimothy Warren1-1/+1
2012-04-19Additional formatting fixesTimothy Warren13-204/+243
2012-04-19Normalize comments in core filesTimothy Warren11-184/+217
2012-04-18Merge pull request #1260 from Razican/db_acPhil Sturgeon2-1/+3
Added the ability to insert objects with insert_batch() in Active Record
2012-04-18Merge pull request #1263 from timw4mail/patchPhil Sturgeon1-1/+2
Updated database config file
2012-04-17minor style fixTimothy Warren1-2/+2
2012-04-17Updated supported database driver listTimothy Warren1-1/+2
2012-04-17Adding a package adds configuration folder to the end of the list.Korri1-2/+2
2012-04-15Added the ability to insert objects with insert_batch() in Active Reccord.Iban Eguia2-1/+3
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 12:39:44 +0100