summaryrefslogtreecommitdiffstats
path: root/user_guide_src
AgeCommit message (Collapse)AuthorFilesLines
2012-05-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into emailTimothy Warren5-15/+21
2012-05-23Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-1/+7
2012-05-23Input, Session and Cookie get's will return NULL.Phil Sturgeon2-13/+6
Read more about this change here: http://codeigniter.com/forums/viewthread/215833
2012-05-23Merge pull request #1357 from timw4mail/errorsPhil Sturgeon2-1/+7
Move errors to views folder
2012-05-23Merge pull request #1379 from brentashley/developPhil Sturgeon1-1/+8
Add step to move existing core extensions to new folder
2012-05-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into emailTimothy Warren1-30/+23
2012-05-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren1-30/+23
2012-05-23Fix a typo in the changelogAndrey Andreev1-1/+1
2012-05-23Removed the parameter use in database drivers' _close() and added a default ↵Andrey Andreev1-30/+23
_close() method in CI_DB_driver + some changelog fixes
2012-05-22fix typo in step 8Brent Ashley1-1/+1
2012-05-22Add step to move existing core extensions to new folderBrent Ashley1-1/+8
2012-05-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into emailTimothy Warren2-1/+24
2012-05-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren2-1/+24
2012-05-21Merge pull request #1372 from juanitomint/developAndrey Andreev2-0/+21
Added unbuffered_row() function (issue #1351)
2012-05-21added a comment for unbuffered_rowJuan Ignacio Borda1-0/+1
2012-05-19Fixed typoJuan Ignacio Borda1-1/+1
2012-05-19Fixed some spacesJuan Ignacio Borda1-1/+1
2012-05-19Add missing changelog entries from 2.1-stableAndrey Andreev1-1/+3
2012-05-18Added doc notes for unbuffered_row() functionJuan Ignacio Borda1-0/+20
2012-05-17Added changelog entryTimothy Warren1-0/+1
2012-05-17merge upstreamTimothy Warren1-0/+1
2012-05-17merge upstreamTimothy Warren1-0/+1
2012-05-17Add parens to changelog entryTimothy Warren1-1/+1
2012-05-17Update inflector docblocks, add changelog entryTimothy Warren1-0/+1
2012-05-17tweak and changelog entryTimothy Warren1-0/+1
2012-05-16Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren1-0/+1
2012-05-16Add note in the upgrade guide to move errors folderTimothy Warren1-1/+6
2012-05-15Minor changes on the pull #1355 additionsAndrey Andreev1-1/+1
2012-05-15Merge pull request #1355 from shidec/developAndrey Andreev1-0/+1
Escaping boolean data type, some DBMS (e.g., postgre) need it
2012-05-15escaping boolean data type for postgre change logSoesapto Joeni Hantoro1-0/+1
2012-05-11Fix issue #1349Andrey Andreev1-2/+3
2012-05-11User_agent library improvementsAndrey Andreev1-1/+1
2012-05-04changelog entryMichiel Vugteveen1-1/+2
2012-05-02Changelog fixAndrey Andreev1-1/+0
2012-05-02Reverted rui_string change.Phil Sturgeon1-0/+2
This had knock-on effects as can be seen in #1306. Issue #122 has been reopend until it is fixed properly.
2012-04-27Merge upstream branchAndrey Andreev27-195/+337
2012-04-26Merge pull request #1266 from timw4mail/patchPhil Sturgeon1-1/+12
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 Warren14-41/+55
2012-04-26Fixed conflicts.Phil Sturgeon17-53/+80
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon1-0/+1
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 Rumbelow25-235/+426
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 Warren2-2/+3
2012-04-26Corrected path to jqueryChad Hedgcock1-2/+2
2012-04-25Merge pull request #1288 from petsagouris/Issue-131Andrey Andreev1-0/+1
Updated foreign_characters.php
2012-04-25Added foreign_characters.php changes in the changelog.George Petsagourakis1-0/+1
2012-04-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-1/+1
2012-04-24Add changelog entry for already fixed issue #23Andrey Andreev1-1/+1
2012-04-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren1-0/+1