summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-03-16update documentation in database/query_builder.rst, change 2 tabs + 4 spaces ↵yaoshanliang3-5/+10
to 3 tabs.
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 ↵yaoshanliang2-5/+8
``count_all_results()``
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
[ci skip] Add windows 10 to config/user_agents.php
2015-03-14Update user_agents.phpOleg Filippov1-0/+1
Add Windows 10
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
[ci skip] HTML helper docs: additional info on heading()
2015-03-13[ci skip] Remove NS usage in CI_SessionAndrey Andreev1-1/+1
It was accidental
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
...worth mentioning...
2015-03-12Merge pull request #3659 from bjjay/bjjay-patch-1Andrey Andreev1-1/+1
[ci skip] Correct a comment link typo
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
I saw at least 2 occurrences of encryption instead of hashing being used for password storage during the past week ...
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
Improve CI_Security unit tests coverage
2015-03-10Fixed indentationHeesung Ahn1-66/+65
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
2015-03-10Update Security Unit testHeesung Ahn1-18/+18
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
2015-03-10Merge origin/develop into CI_Security_Unit_TestHeesung Ahn1-9/+3
2015-03-10Update Security Unit testHeesung Ahn1-3/+91
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
2015-03-09Merge pull request #3653 from bjjay/bjjay-patchAndrey Andreev1-9/+3
Reduce once MB_ENABLED checking
2015-03-09Reduce once MB_ENABLED checkingbjjay1-9/+3
The checking is done in the compat file system/core/compat/mbstring.php
2015-03-08[ci skip] Update CI_Encryption docsAndrey Andreev1-0/+21
Close #3647
2015-03-07Merge pull request #3650 from jim-parry/fix/housekeepingAndrey Andreev3-3/+6
[ci skip] Housekeeping.
2015-03-07Merge pull request #3651 from darkwhispering/developAndrey Andreev1-3/+3
[ci skip] Fix typos in DBUtil userguide
2015-03-07Housekeeping.Master Yoda1-1/+1
Corrected typo in user guide for sessions, corrected misepelled key in calendar language file, added two links & updated wording on the repo readme. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-03-07Housekeeping.Master Yoda1-1/+1
Corrected typo in user guide for sessions, corrected misepelled key in calendar language file, added two links & updated wording on the repo readme. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-03-07removed ending S from csv_from_results and xml_from_results DButil Class ↵Mattias Hedman1-3/+3
reference section in userguide Signed-off-by: Mattias Hedman <mattias.hedman@stopp.se>
2015-03-07Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into ↵Master Yoda26-194/+285
fix/housekeeping
2015-03-07Housekeeping.Master Yoda3-3/+6
Corrected typo in user guide for sessions, corrected misepelled key in calendar language file, added two links & updated wording on the repo readme. Signed-off-by:Master Yoda <jim_parry@bcit.ca>
2015-03-06Merge pull request #3644 from ahnh/CI_Security_testAndrey Andreev1-0/+31
Add unit test for CI_Security::strip_image_tags()
2015-03-05adding more img tags Heesung Ahn1-2/+14
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
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
Emulated locks for Redis and Memcached now have a TTL of 300 seconds (the default HTTP request timeout value on many environments) and 30 attemps, each separated by sleep(1), are made by the blocked request to try and obtain a lock if it has been freed. Additionaly, the blocking time for MySQL's locks, which are also timed, is also set to 300 seconds.
2015-03-03Remove an unused var in CI_LogAndrey Andreev1-8/+1
Was suggested as part of PR #3630, which was rejected due to numerous other changes
2015-03-02Merge pull request #3639 from sv3tli0/patch-1Andrey Andreev1-2/+2
[ci skip] Missing variable in example docs
2015-03-02Small typosv3tli01-2/+2
Missed variable..
2015-03-02test_strip_omage_tagsHeesung Ahn1-0/+19
Signed-off-by:Heesung Ahn <ahn.heesung@gmail.com>
2015-03-01[ci skip] Fix a typo in config.phpAndrey Andreev1-1/+1
2015-02-28[ci skip] Formally deprecate 'global_xss_filtering'Andrey Andreev4-0/+24
2015-02-27Make CI_Input:: read-only as wellAndrey Andreev2-1/+13
2015-02-27Fix #3633Andrey Andreev1-0/+1