summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-10-20get_magic_quotes_gpc() to be executed only if PHP version is 5.3 or lowerAndrey Andreev2-5/+13
2011-10-20Some public and protected method declarationsAndrey Andreev3-59/+59
2011-10-20Merge remote-tracking branch 'upstream/develop' into ci-oci8-driver-php5Andrey Andreev31-252/+1278
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren0-0/+0
2011-10-19Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-1/+9
2011-10-19Merge pull request #595 from diegorivera/patch-1Derek Jones1-1/+9
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19Merge pull request #596 from daylerees/developPhil Sturgeon2-29/+41
2011-10-19matched case on hex colours, and added changelog entryDayle Rees1-0/+1
2011-10-19Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-29/+46
2011-10-19new welcome styles, more in fit with colour schemeDayle Rees1-29/+40
2011-10-19Update system/libraries/Email.phpdiegorivera1-1/+9
2011-10-19Merge pull request #594 from ktomk/patch-8Derek Jones1-0/+5
2011-10-18Merge pull request #592 from kenjis/fix_changelogDerek Jones1-8/+2
2011-10-18Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-8/+2
2011-10-18Merge pull request #569 from timw4mail/patch-2Derek Jones3-0/+30
2011-10-18fix changelog difference between HTML and RSTkenjis1-8/+2
2011-10-18Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren8-142/+532
2011-10-18Renamed constant, added 10px margin to backtraceTimothy Warren2-3/+3
2011-10-18Minor formatting changesTimothy Warren1-0/+1
2011-10-18Minor formatting changesTimothy Warren2-8/+13
2011-10-18Moved backtrace constant to config/constants.phpTimothy Warren2-1/+12
2011-10-18Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch-2Timothy Warren6-142/+502
2011-10-18updated Directory helper docs to use proper PHP method Sphinx rolesDerek Jones1-14/+13
2011-10-18fixed typo in AR docs. NOTE: Sphinx gives a ReST error for unknown title tar...Derek Jones1-1/+2
2011-10-18added some additional notes to the 2.0.0 update notes to highlight some of th...Derek Jones2-0/+54
2011-10-18Merge pull request #307 from kylefarris/isue-276Derek Jones4-128/+434
2011-10-17Check for string value before doing str_replace. (Issue #439)Chris Muench1-1/+4
2011-10-17Added changelog itemTimothy Warren1-1/+1
2011-10-17Added changelog itemTimothy Warren1-1/+2
2011-10-17Added changelog itemTimothy Warren1-1/+1
2011-10-17Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch-2Timothy Warren4-19/+37
2011-10-17Merge pull request #586 from blasto333/developEric Barnes1-1/+4
2011-10-17Merge pull request #587 from plasticated/patch-1Eric Barnes1-1/+1
2011-10-17Changed session table user_agent field to 255 to accomodate long agent string...Shealan Forshaw1-1/+1
2011-10-17Check for string value before doing str_replace. (Issue #439)Chris Muench1-1/+4
2011-10-16Merge pull request #583 from blasto333/developPhil Sturgeon1-16/+29
2011-10-16Fixes issue #439 some slashes not escaped in session dataChris Muench1-16/+29
2011-10-15Merge pull request #579 from appleboy/bug/cacheGreg Aker2-2/+3
2011-10-15Fix #576: using ini_get() to detect if apc is enabled or notBo-Yi Wu2-2/+3
2011-10-14Updated changelog to new changelog format.Kyle Farris1-0/+3
2011-10-14Updated to new documentation for new active record methods.Kyle Farris1-0/+108
2011-10-14REALLY fixed merge problem.Kyle Farris1-43/+0
2011-10-14Fixed merge error.Kyle Farris1-1/+0
2011-10-14Merged with developmentKyle Farris376-28450/+24921
2011-10-14trying to resolve some merge issuesKyle Farris1-41/+41
2011-10-14Merge pull request #575 from ounziw/developEric Barnes1-1/+2
2011-10-14Line Break for L165 Fumito Mizuno1-1/+2
2011-10-13Switch debug backtrace based on SHOW_ERROR_BACKTRACE contstantTimothy Warren1-10/+12