summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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-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
2015-10-31[ci skip] Update download linkAndrey Andreev1-1/+1
2015-10-31[ci skip] Update changelog, version & upgrade instructionsAndrey Andreev5-6/+96
2015-10-31Use proper randomness when generating CAPTCHAsAndrey Andreev1-2/+87
2015-10-31Prevent Host header injectionsAndrey Andreev3-38/+29
2015-10-31Harden xss_clean()Andrey Andreev2-42/+59
2015-10-30Fix #4192Andrey Andreev2-5/+9
2015-10-30[ci skip] Fix changelog entry from latest commitAndrey Andreev1-1/+1
#3201 is actually another issue, the bug fixed by a62aa820bdd3e642f44428b27f2c6cde1baf4adc was just reported in the comments there.
2015-10-30Fix #3201Andrey Andreev3-1/+12
2015-10-23[ci skip] Link HackerOne page in the readmeAndrey Andreev1-1/+2
2015-10-23[ci skip] Link HackerOne page in the readmeAndrey Andreev1-1/+2
2015-10-21Merge pull request #4167 from zhanghongyi/fix-pulldownInstructor, Computer Systems Technology2-5/+46
disable pulldown menu on mobile devices
2015-10-21Merge pull request #4167 from zhanghongyi/fix-pulldownInstructor, Computer Systems Technology2-5/+46
disable pulldown menu on mobile devices
2015-10-19rename cookie values to make codes clearHongyi Zhang1-9/+9
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-10-19Fix #4171 and a number of other transaction bugsAndrey Andreev15-356/+170
2015-10-19Fix #4173Andrey Andreev2-1/+8
This reverts commit 7cc6cea2d421862726081a39e932dbceeefcc775 from PR #3968. At the time this seemed logical, but turns out it breaks the ability to create non-PRIMARY composite keys, so ...
2015-10-19[ci skip] Fix docs about QB cachingAndrey Andreev1-1/+1
It doesn't support set() ... Related: #4175
2015-10-18Fix #4179Andrey Andreev2-0/+5
2015-10-16fix a typo in commentHongyi Zhang1-1/+1
Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-10-16revert img alt changes, fix cookies, and improve pulldown menu in multiple ↵Hongyi Zhang3-9/+43
screen size Signed-off-by: Hongyi Zhang <hongyi73.zhang@gmail.com>
2015-10-13[ci skip] Fix #4170Andrey Andreev2-3/+3
2015-10-13[ci skip] Correct version number in user guide confAndrey Andreev1-2/+2
2015-10-12Merge branch '3.0-stable' into developAndrey Andreev35-255/+474
2015-10-12[ci skip] Correct download link for 3.0.3-devAndrey Andreev1-1/+1
2015-10-12[ci skip] This is 3.0.3-devAndrey Andreev5-4/+20
2015-10-12[ci skip] Add changelog entry for PR #4166Andrey Andreev1-0/+12