summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-02-20Merge pull request #2265 from dionysiosarvanitis/fix/trans_enabledAndrey Andreev1-1/+1
Set transaction enabled flag default to TRUE
2013-02-19Merge pull request #2267 from dionysiosarvanitis/fix/_update_dbAndrey Andreev1-0/+3
Issue #2086 Session_cookie's _update_db not guaranteed to update
2013-02-19Issue #2086 Session_cookie's _update_db not guaranteed to updateDionysis Arvanitis1-0/+3
2013-02-19Set transaction enabled flag default to TRUEDionysis Arvanitis1-1/+1
2013-02-19[ci skip] Fix some changelog entriesAndrey Andreev1-14/+13
2013-02-19Merge pull request #2261 from nisheeth-barthwal/developAndrey Andreev2-2/+6
Fixed Issue #2239
2013-02-19Updated changelognisheeth-barthwal1-0/+1
2013-02-19Fixed the issue with bcc_batch_mode and subjectnisheeth-barthwal1-2/+5
2013-02-19Merge pull request #2253 from davidbarratt/developAndrey Andreev2-5/+5
Allow CodeIgniter Projects to be deployed with composer
2013-02-19Set the --no-progress option for travis composer install commandDavid Barratt1-1/+1
2013-02-19Revert "Revert all changes to see if travis just doesn't like me."David Barratt2-5/+5
This reverts commit eb5991ccd0686d15615bff3a730a641889063943.
2013-02-19Fix form_upload() testAndrey Andreev1-1/+1
2013-02-19Merge pull request #2258 from vlakoff/developAndrey Andreev2-5/+5
Fix a code comment in Upload->_file_mime_type()
2013-02-19Merge pull request #2260 from vlakoff/develop-2Andrey Andreev1-15/+22
Add an upgrade note about change in the results of Directory Helper's directory_map()
2013-02-19Add an upgrade note about change in the results of Directory Helper's ↵vlakoff1-4/+11
directory_map() see issue #1978
2013-02-19Fix typos in upgrade_300.rstvlakoff1-11/+11
2013-02-19Fix a code comment in Upload->_file_mime_type()vlakoff2-5/+5
Availability of dangerous functions is now tested using function_usable().
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
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.