summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-12-12Complete the proposed changes from PR #4300Andrey Andreev3-17/+5
2015-12-12Merge branch 'develop' of github.com:halmai/CodeIgniter into db/init_exceptionAndrey Andreev2-1/+5
2015-12-10Merge pull request #4304 from scherepn/fix-doc-build-errorsAndrey Andreev4-7/+7
[ci skip] Fix mismatched brackets in documentation
2015-12-09Remove accidentally included changePhil Scherer1-1/+1
2015-12-09Fix mismatched brackets in documentationPhil Scherer5-8/+8
Sphinx generates incomplete/incorrect HTML output because there are mismatched brackets in the documentation. Signed-off-by: Phil Scherer <pscher1@umbc.edu>
2015-12-08Remove CI_DB_driver::load_rdriver()Andrey Andreev2-25/+7
2015-12-08Type-hint csv_from_result(), xml_from_result() DB utilitiesAndrey Andreev1-12/+2
Close #4299
2015-12-08documentation for the new RuntimeExceptionHalmai, Csongor1-0/+4
2015-12-08rolling back previous solution; throwing exception if database connection ↵Halmai, Csongor2-5/+1
was not successful.
2015-12-07Merge pull request #4291 from b-kaxa/fix-phpdocAndrey Andreev2-1/+2
[ci skip] phpdoc adjustments in CI_Router and CI_URI
2015-12-07replace spaces with tabsb-kaxa1-1/+1
2015-12-07Detecting if database connection was not successfulHalmai, Csongor1-0/+4
2015-12-06fix phpdocb-kaxa2-1/+2
2015-11-26Merge pull request #4273 from suhindra/developAndrey Andreev1-2/+2
[ci skip] Fix another file name in the docsaccording Similarly to PR #4271
2015-11-26fix another file name according PR #4271Suhindra1-2/+2
Fix another file name in documentation according PR #4271
2015-11-25Merge pull request #4271 from galdiolo/patch-12Andrey Andreev1-1/+1
[ci skip] Fix file name in documentation
2015-11-25Fix file nameClaudio Galdiolo1-1/+1
With case-sensitive filesystem, visiting example.com/index.php/form/ returns a '404 Page Not Found' error
2015-11-16Merge pull request #4236 from galdiolo/patch-11Andrey Andreev5-5/+5
[ci skip] Bump PHP version number to 5.5
2015-11-16[ci skip] Polish changes from PR #4240Andrey Andreev2-40/+35
2015-11-16Merge pull request #4240 from sskaje/developAndrey Andreev2-11/+44
Add unix socket support to redis session driver
2015-11-16do not try to auth/select db on redis connect failurekemeng1-11/+17
2015-11-16 Spaces around ! . Changelog entry in 3.1.0.kemeng2-2/+7
2015-11-16fixed a typo in unix socket parameter; change coding style to match CI; fix ↵kemeng1-6/+10
an elseif
2015-11-16Merge pull request #4241 from suhindra/developAndrey Andreev1-1/+2
[ci skip] Added/updated MIME types for Flash Video
2015-11-14Added and Updated MIME types for Flash VideoSuhindra1-1/+2
Update 'f4v' entry and add 'flv' to support Flash Video as allowed file type.
2015-11-14add unix socket support to redis session driversskaje1-1/+19
2015-11-12Merge pull request #4239 from craigdanj/patch-1Andrey Andreev1-1/+1
[ci skip] Grammar correction in database configuration guide
2015-11-12Grammar correction in database configuration guideCraig Johnson1-1/+1
"it" changed to "in" on line 10. "in" seems like the correct word to be used there. Small change.
2015-11-11[ci skip] Make it clear that PHP <5.5 usage is discouragedClaudio Galdiolo5-5/+5
PHP 5.4 reached end of life Signed-off-by: Claudio Galdiolo <claudio.galdiolo@gmail.com>
2015-11-09Merge pull request #4223 from j0inty/developAndrey Andreev1-1/+4
CI_DB_driver->simple_query() to check initialize() return value
2015-11-09Fixed PHP code style part 2Steffen Stollfuß1-1/+1
* added missing space character
2015-11-09Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-4/+25
2015-11-09Merge pull request #4225 from zhanghongyi/loader-testAndrey Andreev1-4/+25
Improve Loader test cases for libraries
2015-11-09modify and add test cases for Loader class to test more exceptionsHongyi Zhang1-4/+25
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-11-09Fixed PHP code styleSteffen Stollfuß1-1/+1
* fixed PHP code style
2015-11-09Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-1/+10
2015-11-09Merge pull request #4217 from natesilva/fix-ipv6-base_urlAndrey Andreev1-1/+10
Build base_url correctly if SERVER_ADDR is IPv6
2015-11-08CI_DB_driver->simple_query() discard return of CI_DB_driver->initialize() ↵Steffen Stollfuß1-1/+4
when db_debug = FALSE #4223
2015-11-08Merge pull request #1 from bcit-ci/developSteffen Stollfuß34-454/+504
Pull current develop branch to submit a bug report later
2015-11-06Minor formatting: add empty line after else closeNate Silva1-0/+1
2015-11-06Tweak to match CI coding styleNate Silva1-1/+1
2015-11-06Simpler way to detect an IPv6 address (strpos)Nate Silva1-1/+1
2015-11-06Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-0/+8
2015-11-06Merge pull request #4218 from schwemmer/developAndrey Andreev1-0/+8
[ci skip] Added MIME types for JPEG2000
2015-11-06Fixed white-space for JPEG2000 MIME typesRafael Schwemmer1-8/+8
Replaced spaces by tabs to be consistent with rest of the code
2015-11-05Added MIME types for JPEG2000Rafael Schwemmer1-0/+8
Added all MIME types and file extensions to support JPEG2000 images as allowed file type.
2015-11-05Build base_url correctly if SERVER_ADDR is IPv6Nate Silva1-1/+9
2015-11-04[ci skip] Add 3.0.4 to changelog as wellAndrey Andreev1-0/+4
2015-11-04Merge branch '3.0-stable' into developAndrey Andreev32-453/+494
2015-11-04[ci skip] Start of 3.0.4 developmentAndrey Andreev5-4/+20