summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-03-18Merge pull request #3680 from schwemmer/patch-1Andrey Andreev1-2/+2
2015-03-18Fixed a typo in uri.rst documentationRafael Schwemmer1-2/+2
2015-03-18Polish some recent changes in test casesAndrey Andreev2-16/+14
2015-03-17Merge pull request #3676 from ahnh/UnitTest_CI_Input_fetch_from_arrayAndrey Andreev1-0/+9
2015-03-17Updated fetch_from_array unit testHeesung Ahn1-0/+9
2015-03-16[ci skip] Polish changes from PR #3669Andrey Andreev2-7/+8
2015-03-16Merge pull request #3669 from yaoshanliang/developAndrey Andreev3-2/+14
2015-03-16update documentation in database/query_builder.rst, change 2 tabs + 4 spaces ...yaoshanliang3-5/+10
2015-03-16Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developyaoshanliang1-1/+1
2015-03-15[ci skip] Use DIRECTORY_SEPARATOR instead of / in CI_ConfigAndrey Andreev1-1/+1
2015-03-15add changelog and documentation for adding an optional parameter to ``count_a...yaoshanliang2-5/+8
2015-03-15Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developyaoshanliang2-0/+3
2015-03-14Merge pull request #3671 from mZer0ne/patch-3Andrey Andreev1-0/+1
2015-03-14Update user_agents.phpOleg Filippov1-0/+1
2015-03-14[ci skip] Add a note about sess_save_path in config.phpAndrey Andreev1-0/+2
2015-03-14add a judgment of whether reset selectyaoshanliang1-4/+5
2015-03-14add a judgment of whether reset selectyaoshanliang1-2/+5
2015-03-13Merge pull request #3662 from avenirer/patch-8Andrey Andreev1-4/+7
2015-03-13[ci skip] Remove NS usage in CI_SessionAndrey Andreev1-1/+1
2015-03-13Close #3663Andrey Andreev2-1/+2
2015-03-12Update html_helper.rstAdrian Voicu1-3/+3
2015-03-12Update html_helper.rstAdrian Voicu1-6/+6
2015-03-12Update html_helper.rstAdrian Voicu1-1/+1
2015-03-12additional info on heading() functionAdrian Voicu1-8/+11
2015-03-12Merge pull request #3659 from bjjay/bjjay-patch-1Andrey Andreev1-1/+1
2015-03-12Throw an exception on invalid session driver configAndrey Andreev1-6/+2
2015-03-12Correct a comment link typobjjay1-1/+1
2015-03-11[ci skip] Add a note about password storage in CI_Encryption docsAndrey Andreev1-0/+5
2015-03-10Add array typehint to CI_Email::__construct()Andrey Andreev1-1/+1
2015-03-10Merge pull request #3655 from ahnh/CI_Security_Unit_TestAndrey Andreev1-28/+115
2015-03-10Fixed indentationHeesung Ahn1-66/+65
2015-03-10Update Security Unit testHeesung Ahn1-18/+18
2015-03-10Merge origin/develop into CI_Security_Unit_TestHeesung Ahn1-9/+3
2015-03-10Update Security Unit testHeesung Ahn1-3/+91
2015-03-09Merge pull request #3653 from bjjay/bjjay-patchAndrey Andreev1-9/+3
2015-03-09Reduce once MB_ENABLED checkingbjjay1-9/+3
2015-03-08[ci skip] Update CI_Encryption docsAndrey Andreev1-0/+21
2015-03-07Merge pull request #3650 from jim-parry/fix/housekeepingAndrey Andreev3-3/+6
2015-03-07Merge pull request #3651 from darkwhispering/developAndrey Andreev1-3/+3
2015-03-07Housekeeping.Master Yoda1-1/+1
2015-03-07Housekeeping.Master Yoda1-1/+1
2015-03-07removed ending S from csv_from_results and xml_from_results DButil Class refe...Mattias Hedman1-3/+3
2015-03-07Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into fix/hou...Master Yoda26-194/+285
2015-03-07Housekeeping.Master Yoda3-3/+6
2015-03-06Merge pull request #3644 from ahnh/CI_Security_testAndrey Andreev1-0/+31
2015-03-05adding more img tags Heesung Ahn1-2/+14
2015-03-05Merge origin/develop into CI_Security_testHeesung Ahn7-70/+33
2015-03-05Fix #3642Andrey Andreev1-7/+5
2015-03-04Fix #3627: Keep timed locks for more than 5 secondsAndrey Andreev4-53/+25
2015-03-03Remove an unused var in CI_LogAndrey Andreev1-8/+1