summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-10-05update devel versionMelounek176-3353/+8138
2012-10-05Merge pull request #1682 from dhinus/patch-1Andrey Andreev1-7/+6
2012-10-05Fix issue #1340 [ci skip]Andrey Andreev1-0/+1
2012-10-05[ci skip] Fix up the cheatsheets page (original pull #1244)Andrey Andreev2-4/+11
2012-10-05Add PNG transparency support in CI_Image_lib::text_watermark() (originally fr...Andrey Andreev2-4/+12
2012-10-05[ci skip] Add a note to the user guide regarding issue #1010Andrey Andreev1-2/+3
2012-10-05Fix issue #935 [ci skip]Andrey Andreev1-2/+2
2012-10-05Merge pull request #1854 from tocaibiza/developAndrey Andreev1-4/+4
2012-10-05Manually apply pull #300 (fixes #295) [ci skip]Andrey Andreev4-15/+22
2012-10-05Bug-fix in XML-RPC libraryDimitar1-4/+4
2012-10-05Fix issue #116 + other space/style fixes [ci skipAndrey Andreev5-17/+16
2012-10-05Merge pull request #1848 from blyxx86/developAndrey Andreev2-0/+6
2012-10-05Fixed conflicts in changelog to reflect all changes.Kyle Johnson22-100/+60
2012-10-05Merge pull request #1851 from daniel-honestempire/developAndrey Andreev2-5/+2
2012-10-04Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developDaniel Morris19-93/+52
2012-10-04Compatibility with PHP 5.2.4 and enclosed ternary operationDaniel Morris1-1/+1
2012-10-04Default to HTTP/1.1 if $server_protocol is not setDaniel Morris1-1/+1
2012-10-04DRY determining server protocolDaniel Morris2-5/+2
2012-10-04Updated changelog with bugfix (#395)Kyle Johnson1-0/+1
2012-10-04Misc. style fixes [ci skip]Andrey Andreev2-31/+38
2012-10-04Merge pull request #1847 from daniel-honestempire/developAndrey Andreev2-2/+4
2012-10-04Fix escape_like_str() testsAndrey Andreev1-2/+2
2012-10-04Fix issue #1789Andrey Andreev17-60/+12
2012-10-04Updated changelog to include changes to the Encryption libraryDaniel Morris1-0/+2
2012-10-04Removed redundant parenthesis around `in_array()`Daniel Morris1-1/+1
2012-10-03Updated result function to check for visible items as defined in issue #395Kyle Johnson1-0/+5
2012-10-03Support for hashing algorithms other than SHA1 and MD5Daniel Morris1-2/+2
2012-10-02Added .dot and .dotx mimes. Fixes #1803Alex Bilbie1-0/+2
2012-10-02Added 'binary/octet-stream' as PDF mime. Fixes #1840 and #1828Alex Bilbie1-1/+1
2012-09-24Merge pull request #1821 from Kristories/patch-1Andrey Andreev1-1/+1
2012-09-23Update user_guide_src/source/libraries/loader.rstW. Kristianto1-1/+1
2012-09-21Merge pull request #1820 from appleboy/paginationAlex Bilbie1-1/+2
2012-09-21Merge pull request #1819 from appleboy/documentAlex Bilbie1-1/+1
2012-09-21Fixed #1817 Pagination class errorBo-Yi Wu1-1/+2
2012-09-21Fixed pagination document error.Bo-Yi Wu1-1/+1
2012-09-20Merge pull request #1816 from progmedia/developAndrey Andreev1-1/+1
2012-09-20Fixes issue #1815 - input::ip_address() returns incorrect IP behind proxyAdam McCann1-1/+1
2012-09-19Changed the contributing file to a markdown document as Github doesn't suppor...Alex Bilbie2-159/+92
2012-09-19Added a contributing file to appear in pull requests and issuesAlex Bilbie2-160/+159
2012-09-19Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/de...Alex Bilbie15-19/+32
2012-09-19Ignore composer vendor directoryAlex Bilbie1-1/+2
2012-09-17Merge pull request #1783 from vlakoff/developAndrey Andreev3-2/+7
2012-09-17Changelog: add entry for the change in "auto" method of redirect()vlakoff1-0/+1
2012-09-17redirect() documentation: add a note for IIS usersvlakoff1-0/+4
2012-09-17Merge pull request #1806 from vlakoff/develop-2Andrey Andreev1-2/+2
2012-09-16Better method for getting Output cache file embedded timestampvlakoff1-2/+2
2012-09-16Minor change in Output cache file checkvlakoff1-1/+1
2012-09-15Merge pull request #1801 from vlakoff/develop-2Andrey Andreev1-1/+1
2012-09-15Update reserved names documentationvlakoff1-1/+1
2012-09-14Merge pull request #1794 from vlakoff/develop-2Andrey Andreev3-2/+5