summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-02-19Revert "Revert all changes to see if travis just doesn't like me."David Barratt2-5/+5
2013-02-19Revert all changes to see if travis just doesn't like me.David Barratt2-5/+5
2013-02-18Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developDavid Barratt4-2/+51
2013-02-18vfsStream is required for travisDavid Barratt1-1/+4
2013-02-18See how many errors are produced when no dependencies are includedDavid Barratt1-5/+1
2013-02-18Simplify the composer commandDavid Barratt1-2/+1
2013-02-18Revert "Attempt to get travis to work by adding php-invoker"David Barratt1-2/+1
2013-02-18Attempt to get travis to work by adding php-invokerDavid Barratt1-1/+2
2013-02-18Set the --no-progress option for travis composer install commandDavid Barratt1-1/+1
2013-02-18Set the --dev option for travis composer install command.David Barratt1-1/+1
2013-02-18Merge pull request #2256 from nisheeth-barthwal/developAndrey Andreev3-1/+50
2013-02-18removed a stray tabnisheeth-barthwal1-1/+1
2013-02-18Removed the unused $force paramter in Email::_smtp_connect()nisheeth-barthwal1-29/+29
2013-02-18removed PR from the bug listnisheeth-barthwal2-2/+2
2013-02-18Styleguide fixesnisheeth-barthwal1-4/+3
2013-02-18Fixed curly braces. Removed redundant method set_useragent()nisheeth-barthwal1-20/+11
2013-02-18Clean upnisheeth-barthwal2-0/+4
2013-02-18Fixed tab-indentation. Made appropriate entries in changelognisheeth-barthwal1-283/+282
2013-02-18Merge pull request #2257 from appleboy/helperAndrey Andreev1-1/+1
2013-02-18Fix a JSON validation errorDavid Barratt1-2/+2
2013-02-18Move mikey179/vfsStream to only be required on devDavid Barratt1-1/+1
2013-02-18Fixed form helper variable errorBo-Yi Wu1-1/+1
2013-02-17Added keep-alive connection to SMTP. Fixed socket read/write timeouts. Added ...nisheeth-barthwal1-234/+290
2013-02-16Update the required version of PHP to 5.2.4David Barratt1-1/+1
2013-02-16Require at least PHP 5.1.6.David Barratt1-0/+1
2013-02-16Lowercase the project name as uppercase letters are not allowed.David Barratt1-3/+3
2013-02-16Add the Project Name to the Composer File.David Barratt1-0/+1
2013-02-15Fix #2247Andrey Andreev1-6/+3
2013-02-15Fix some stuff from recent pull requestsAndrey Andreev5-17/+29
2013-02-15Merge pull request #2245 from maltzurra/patch-1Andrey Andreev1-2/+2
2013-02-15Merge pull request #2243 from chrispassas/developAndrey Andreev3-1/+18
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
2013-02-15Revert "Update system/core/Log.php"Chris Passas1-9/+2
2013-02-15Revert "Revert "Update system/core/Common.php""Chris Passas1-2/+2
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
2013-02-15Update system/core/Common.phpChris Passas1-2/+2
2013-02-15Update system/core/Log.phpChris Passas1-1/+1
2013-02-15Merge pull request #2248 from vlakoff/developAndrey Andreev11-14/+14
2013-02-15Various cosmetic fixesvlakoff11-14/+14
2013-02-14Update system/core/Common.phpmaltzurra1-2/+1
2013-02-14Update system/core/Common.phpmaltzurra1-1/+2
2013-02-14Update system/core/Log.phpChris Passas1-1/+4
2013-02-14Update system/core/Log.phpChris Passas1-1/+1
2013-02-14Merge pull request #2241 from TimHas/developAndrey Andreev3-2/+7
2013-02-14Update system/core/Common.phpmaltzurra1-2/+2
2013-02-14changes according to narfbg's requestTim2-3/+3
2013-02-13changes according to narfbg's requestTim3-4/+7
2013-02-13Added support for changing the default log file extension from .php to whatev...Chris Passas3-0/+14
2013-02-13Update system/core/Log.phpChris Passas1-2/+9
2013-02-13Added small feature to profiler: total execution time countTim1-2/+4