summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Collapse)AuthorFilesLines
2012-04-27Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into ↵Timothy Warren2-11/+16
library-cleanup
2012-04-27Merge pull request #1298 from zivyuan/patch-1Phil Sturgeon1-0/+1
Cookie $index should start with a prefix.
2012-04-27Merge upstream branchAndrey Andreev16-508/+588
2012-04-27Update system/core/Input.php ziv1-0/+1
Fix a cookie get back problem. Cookie $index should start with a prefix.
2012-04-27Fix Config.php and partially fix Image_lib.phpTimothy Warren1-7/+0
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren3-10/+13
2012-04-26Merge pull request #1262 from Korri/developPhil Sturgeon1-2/+2
Fix Issue #627
2012-04-26Fixed conflicts.Phil Sturgeon4-28/+25
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon2-3/+6
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow16-263/+272
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-23Use tabs to separate class propertiesTimothy Warren14-55/+54
2012-04-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren2-14/+11
2012-04-23Merge upstreamTimothy Warren1-3/+1
2012-04-23Merge pull request #1271 from dixy/develop-microtimeAndrey Andreev1-7/+4
Use parameter 'get_as_float' of microtime()
2012-04-23Fix issue #1265Andrey Andreev1-8/+8
2012-04-21Use parameter 'get_as_float' of microtime()dixy1-7/+4
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-17Adding a package adds configuration folder to the end of the list.Korri1-2/+2
2012-04-13Switch erroneously declared protected properties in Output class to publicAndrey Andreev1-7/+7
2012-04-03Some improvements to the additions from pull #1234Andrey Andreev1-7/+7
2012-04-02The current name is too wide change to get_content_type()consistent with ↵Songpol Sripaoeiam1-1/+1
set_content_type()
2012-04-01Fix style codingSongpol Sripao-eiam1-1/+2
2012-04-01bracket on a new lineSongpol Sripaoeiam1-5/+6
Also add space after foreach bracket on a new line... Also add a space after if Follow up from https://github.com/EllisLab/CodeIgniter/pull/1234/files#r630522
2012-04-01add function get_current_content_type to output class and user manual librarySongpol Sripaoeiam1-0/+18
2012-03-28Fix a CI_Loader::_ci_load_class() bugAndrey Andreev1-1/+1
2012-03-26Some style adjustments and fixed comments in the Loader classAndrey Andreev1-30/+29
2012-03-26Some style adjustments and fixed comments in Router and Output classesAndrey Andreev2-28/+24
2012-03-26Remove access description lines and fix comments in system/core/Common.phpAndrey Andreev1-94/+96
2012-03-26Make _initialize() a constructor and rename _call_hook() to call_hook in the ↵Andrey Andreev2-27/+19
Hooks class
2012-03-26Add visibility declarations where they remain missingAndrey Andreev1-4/+2
2012-03-20Merge upstream branchAndrey Andreev16-59/+64
2012-03-19Merge pull request #1182 from freewil/cookies-httponlyAndrey Andreev2-5/+18
Cookies httponly
2012-03-18add support for httponly cookiesfreewil2-5/+18
2012-03-14Merged unit test progress.Phil Sturgeon3-34/+12
2012-03-14Merge branch 'feature/unit-tests' into developPhil Sturgeon2-3/+17
2012-03-10Fix incomplete and skipped testTaufan Aditya1-1/+1
2012-03-10Merge pull request #1155 from chrisguiney/developPhil Sturgeon1-1/+10
Allow drivers to be loaded as an array, like models and libraries.
2012-03-10Fixing some spacing.Christopher Guiney1-2/+2
2012-03-10Remove PHP 5.1.6-specific codeAndrey Andreev2-33/+2
2012-03-10Allow drivers to be loaded as an array, like models and libraries.Christopher Guiney1-1/+10
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-3/+20
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon16-16/+16
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-03-09Merge upstream branchAndrey Andreev3-22/+40
2012-03-08Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow2-2/+19
2012-03-08Fix issue #940Andrey Andreev1-2/+2
2012-03-07comment fixMichiel Vugteveen1-1/+1
2012-03-07oopsMichiel Vugteveen1-1/+1
2012-03-07removed is_methodMichiel Vugteveen1-18/+6
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-07-17 11:02:39 +0200