summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-10-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren4-151/+120
2011-10-23Merge pull request #607 from burakerdem/patch-1Greg Aker1-2/+2
Removed short open tags.
2011-10-23Removed short open tags.Burak Erdem1-2/+2
2011-10-22Merge pull request #553 from narfbg/ci-oci8-driver-php5Phil Sturgeon3-149/+118
Cleanup and switch oci8_driver and oci8_result to PHP5 functions.
2011-10-21fixing typo in attribution blockDerek Jones19-19/+19
2011-10-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren19-19/+19
2011-10-21Revert "Changed session table user_agent field to 255 to accomodate long ↵Timothy Warren1-1/+1
agent strings. Truncation of this data would cause the session to not match when the "sess_match_useragent" config option was set to TRUE." This reverts commit f7a01fc4522ab7370b9a3c45b5c41b0c545550f9.
2011-10-21Revert "matched case on hex colours, and added changelog entry"Timothy Warren1-1/+0
This reverts commit 8cae06aea11f38ae50c6389c0057469a743c5adb.
2011-10-21Revert "new welcome styles, more in fit with colour scheme"Timothy Warren1-40/+29
This reverts commit 8499d2a8d95eb59e94375b0f3605b25673980ab3.
2011-10-21Minor format fixTimothy Warren1-2/+0
2011-10-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren159-708/+4026
2011-10-21Fix mysql charset bugTimothy Warren1-4/+22
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones159-692/+4014
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
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-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
Update system/libraries/Email.php
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
New welcome styles, more in fit with colour scheme.
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
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 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
Added simple backtrace to php error file
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 ↵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-17Merge pull request #586 from blasto333/developEric Barnes1-1/+4
Check for string value before doing str_replace. (Issue #439)
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 19:28:27 +0100