summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-11-12Merge pull request #639 from timw4mail/patch-3Eric Barnes1-4/+19
Fixed one-liner code on Database Connection page of userguide
2011-11-11Merge pull request #653 from mpmont/developGreg Aker2-0/+2
Added the mime type for pptx.
2011-11-08Changelog update.mpmont1-0/+1
2011-11-08Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon5-19/+29
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-08Merge pull request #654 from polyetilen/patch-1Phil Sturgeon1-1/+1
Update user_guide_src/source/tutorial/static_pages.rst
2011-11-08Update user_guide_src/source/tutorial/static_pages.rstAleksandras Ragovskis1-1/+1
2011-11-08Added the mime type for pptx. The new Power point format.mpmont1-0/+1
2011-11-07Adding auto-detection of best redirect method in url_helper.Brandon Jones2-11/+18
2011-11-07Merge pull request #651 from polyetilen/patch-1Phil Sturgeon1-1/+1
Logic error in pages tutorial code example.
2011-11-07Syntax errorpolyetilen1-1/+1
2011-11-02Merge pull request #643 from comp500/developPhil Sturgeon1-1/+4
Add Nintendo mobile devices.
2011-11-02add Nintendo mobile devicescomp5001-1/+4
2011-10-31Merge pull request #624 from talkingwithsean/developDerek Jones1-5/+5
Crypt isn't set and it causes extensive script time when specifying a cus
2011-10-31Merge pull request #606 from timw4mail/developPhil Sturgeon1-9/+20
PDO/MySQL charset setting fix.
2011-10-31Fixed one-liner code on Database Connection page of userguideTimothy Warren1-4/+19
2011-10-27Crypt isn't set and it causes extensive script time when specifying a custom ↵Sean Fisher1-5/+5
SMTP server
2011-10-26Misc formatting fixesTimothy Warren1-6/+7
2011-10-26Set charset in DSN if PHP >= 5.3.6Timothy Warren1-0/+6
2011-10-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-6/+4
2011-10-26Merge pull request #622 from kenjis/fix_active_record.rstPhil Sturgeon1-6/+4
Fix user guide active_record.rst formatting and removed old PHP 5 note.
2011-10-26fix user guide active_record.rst formatting, remove old PHP 5 note, now only ↵kenjis1-6/+4
PHP 5 is supported.
2011-10-25Changed mysql charset to PDO optionTimothy Warren1-6/+6
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