summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-10-20Merge pull request #601 from kenjis/fix_user_guideEric Barnes2-15/+15
fix RST format and typo
2011-10-20Merge pull request #600 from narfbg/ci-issue-467Phil Sturgeon2-5/+13
get_magic_quotes_gpc() to be executed only if PHP version is 5.3 or lower
2011-10-20fix RST format and typokenjis2-15/+15
2011-10-20get_magic_quotes_gpc() to be executed only if PHP version is 5.3 or lowerAndrey Andreev2-5/+13
2011-10-19I wasn't following the CI code style guide.diegorivera1-3/+3
2011-10-19Update system/libraries/Email.phpdiegorivera1-1/+9
2011-10-19Merge pull request #594 from ktomk/patch-8Derek Jones1-0/+5
CI_Loader::driver() processes empty library. Fixed.
2011-10-18Merge pull request #592 from kenjis/fix_changelogDerek Jones1-8/+2
fix changelog difference between HTML and RST
2011-10-18Merge pull request #569 from timw4mail/patch-2Derek Jones3-0/+30
Added simple backtrace to php error file
2011-10-18fix changelog difference between HTML and RSTkenjis1-8/+2
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 ↵Derek Jones1-1/+2
targets, but they do exist, and links are built properly
2011-10-18added some additional notes to the 2.0.0 update notes to highlight some of ↵Derek Jones2-0/+54
the potential gotchas, fixes #588
2011-10-18Merge pull request #307 from kylefarris/isue-276Derek Jones4-128/+434
Fix for Issue #276 - Thanks Kyle!
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-16Merge pull request #583 from blasto333/developPhil Sturgeon1-16/+29
Fixes issue #439 some slashes not escaped in session data.
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
Fix #576: using ini_get() to detect if apc is enabled or not
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
Line Break for L165
2011-10-14Line Break for L165 Fumito Mizuno1-1/+2
$mysql = '20061124092345'; $unix = mysql_to_unix($mysql);
2011-10-13Switch debug backtrace based on SHOW_ERROR_BACKTRACE contstantTimothy Warren1-10/+12
2011-10-13Added backtrace contstantTimothy Warren1-0/+1
2011-10-13Fixed code style issueTimothy Warren1-1/+1
2011-10-13Added simple backtrace to php error fileTimothy Warren1-1/+10
2011-10-13Merge pull request #566 from appleboy/bugGreg Aker1-1/+1
Fix typo error #564
2011-10-13Update: fix typo error #564Bo-Yi Wu1-1/+1
2011-10-11Merge pull request #559 from timw4mail/developPhil Sturgeon1-7/+7
Fixed some formatting issues with the changelog.
2011-10-11Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren8-69/+69
2011-10-11removed 'index' listing from tutorial index tocDerek Jones1-1/+0
2011-10-10unhid general topics ToC for navigationDerek Jones1-1/+0
2011-10-10Merge branch 'feature/userguide-toc' into developDerek Jones7-67/+69
Conflicts: user_guide_src/source/_themes/eldocs/layout.html user_guide_src/source/general/index.rst user_guide_src/source/index.rst
2011-10-10Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren6-1/+612
2011-10-10incremental improvement to user guide ToCDerek Jones7-36/+71
2011-10-10Merge pull request #266 from joelcox/feature/tutorialEric Barnes6-1/+612
User guide tutorial
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 21:12:12 +0100