summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
This reverts commit 1396a958a5b96cc6c617ae725034fa58542acd25.
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
Added keep-alive connection to SMTP. Fixed socket read/write timeouts. Added PHP useragent.
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
Fixed form helper variable error
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
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2013-02-17Added keep-alive connection to SMTP. Fixed socket read/write timeouts. Added ↵nisheeth-barthwal1-234/+290
PHP useragent
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
Fixed is_https() to avoid incorrect detection.
2013-02-15Merge pull request #2243 from chrispassas/developAndrey Andreev3-1/+18
Update system/core/Log.php
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
This reverts commit 8af05ac97513764cc539919e179794df87352c30.
2013-02-15Revert "Update system/core/Log.php"Chris Passas1-9/+2
This reverts commit bbc6ab4736a896be83e3e3d5f8856374ffa2984c.
2013-02-15Revert "Revert "Update system/core/Common.php""Chris Passas1-2/+2
This reverts commit 3de57eaea8510ea9cfd70f063565c24904669c4c.
2013-02-15Revert "Update system/core/Common.php"Chris Passas1-2/+2
This reverts commit 8af05ac97513764cc539919e179794df87352c30.
2013-02-15Update system/core/Common.phpChris Passas1-2/+2
If using nginx instead of apache by default nginx will not populate the $_SERVER['HTTPS'] value.  This change allows falling back to checking the port number of the request to determine if your on SSL or not. The other option is adding the following to your nginx config. fastcgi_param HTTPS on; #some php apps require this to detent https
2013-02-15Update system/core/Log.phpChris Passas1-1/+1
Added a space after the comma on the ltrim().
2013-02-15Merge pull request #2248 from vlakoff/developAndrey Andreev11-14/+14
Various cosmetic fixes
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
Don't print no script access code into log file if log file is not .php anymore.
2013-02-14Update system/core/Log.phpChris Passas1-1/+1
Added ltrim() as requested to strip '.' incase it's added by mistake.
2013-02-14Merge pull request #2241 from TimHas/developAndrey Andreev3-2/+7
Added small feature to profiler: total execution time count
2013-02-14Update system/core/Common.phpmaltzurra1-2/+2
Updated is_https() to avoid "NULL" or "0" values to set HTTPS.
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 ↵Chris Passas3-0/+14
whatever is preferred. example (.log) This is a follow up to this pull request. https://github.com/EllisLab/CodeIgniter/pull/2243
2013-02-13Update system/core/Log.phpChris Passas1-2/+9
Updated Log.php so that a developer can extend it and change the log file extension. It makes sense to default to .php when logs are in the public web folder.  It would be nice if a developer moves the log file path we have the option to use a standard extension like .log
2013-02-13Added small feature to profiler: total execution time countTim1-2/+4
adds additional information to profiler like: DATABASE:  test   QUERIES: 3 (0.0016s)  (Hide)
2013-02-08Fix issue #2230Andrey Andreev1-3/+3
2013-02-08[ci skip] Remove unnecessary string casts in PaginationAndrey Andreev2-4/+3