summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-01-23[ci skip] Add changelog entries for PR #4990Andrey Andreev1-0/+2
2017-01-23Merge pull request #4990 from tianhe1986/develop_profilerAndrey Andreev1-5/+5
2017-01-23Merge pull request #4991 from verkhoumov/developAndrey Andreev1-5/+0
2017-01-23Merge pull request #4030 from DiederikLascaris/developAndrey Andreev6-209/+305
2017-01-23Merge pull request #4990 from tianhe1986/develop_profilerAndrey Andreev1-5/+5
2017-01-23Merge pull request #4991 from verkhoumov/developAndrey Andreev1-5/+0
2017-01-22Removed wrapper and changed mix cases usage of hex colorcodesDiederikLascaris6-274/+248
2017-01-22Merge branch 'develop' of git://github.com/bcit-ci/CodeIgniter into developDiederikLascaris328-10283/+6738
2017-01-21Fixed show_error() for check $exit_statusDmitriy Verkhoumov1-5/+0
2017-01-21Close <pre> tag.tianhe19861-3/+3
2017-01-21Also convert single quotes.tianhe19861-2/+2
2017-01-20Don't use each()Andrey Andreev3-23/+21
2017-01-19hash_pbkdf2() byte-safety again ... actually tell mbstring to use 8bitAndrey Andreev1-2/+2
2017-01-19hash_pbkdf2() byte-safetyAndrey Andreev2-5/+14
2017-01-19Again the Travis script line ... a typoAndrey Andreev1-1/+1
2017-01-19Fix Travis tests script lineAndrey Andreev1-1/+1
2017-01-19More byte-safetyAndrey Andreev7-28/+31
2017-01-19Fix byte-safety issues & actually test for themAndrey Andreev9-30/+93
2017-01-17[ci skip] Add changelog entry for #4987Andrey Andreev1-0/+1
2017-01-17Merge pull request #4987 from tianhe1986/develop_qb_alias_table_cacheAndrey Andreev1-9/+15
2017-01-17Merge pull request #4987 from tianhe1986/develop_qb_alias_table_cacheAndrey Andreev1-9/+15
2017-01-17Format fix。tianhe19861-2/+2
2017-01-171 Keep just 'list'.tianhe19861-13/+13
2017-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev39-48/+48
2017-01-17[ci skip] Merge pull request #4986 from ka7/feature/spellingAndrey Andreev40-49/+49
2017-01-17Address #4980Andrey Andreev1-13/+14
2017-01-17Add aliased tables cache.tianhe19861-17/+23
2017-01-16spelling fixes(1)klemens1-1/+1
2017-01-16spelling fixesklemens40-49/+49
2017-01-16[ci skip] Fix #4985Andrey Andreev1-1/+1
2017-01-11[ci skip] Add a changelog entry for 37226c036a52ae857b13109774b1cdfc4b1d4db9Andrey Andreev1-0/+1
2017-01-11Merge branch 'feature/sess_db_destroy' into 3.1-stableAndrey Andreev1-5/+5
2017-01-11[ci skip] Add changelog entry for #4977Andrey Andreev1-0/+1
2017-01-11[ci skip] Merge pull request #4977 from fabiospampinato/fabiospampinato-loade...Andrey Andreev1-1/+1
2017-01-11[ci skip] Merge pull request #4977 from fabiospampinato/fabiospampinato-loade...Andrey Andreev1-1/+1
2017-01-11Fixed regex used for loading helpersFabio Spampinato1-1/+1
2017-01-11[ci skip] Fix an error with DB sessions triggered with regenerate + destroyAndrey Andreev1-5/+5
2017-01-10Disallow Travis failures for PHP 7.1Andrey Andreev1-1/+0
2017-01-10Merge branch '3.1-stable' into developAndrey Andreev14-72/+207
2017-01-10[ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1Andrey Andreev2-0/+14
2017-01-10Add a testcase and changelog entry for #4975Andrey Andreev2-2/+8
2017-01-10Merge pull request #4975 from cfaulkner/fix_ci_prepare_view_varsAndrey Andreev1-2/+2
2017-01-10Fix Undefined variable: object errorChris Faulkner1-2/+2
2017-01-09[ci skip] Mark the beginning of 3.1.4-devAndrey Andreev6-4/+26
2017-01-09[ci skip] Prepare 3.1.3 releaseAndrey Andreev4-5/+5
2017-01-09Merge branch 'security' into 3.1-stableAndrey Andreev5-43/+85
2017-01-06[ci skip] Add changelog entry for PR #4825Andrey Andreev1-1/+5
2017-01-06Merge pull request #4825 from gxgpet/developAndrey Andreev1-9/+3
2017-01-06[ci skip] Add a changelog entry for #4765Andrey Andreev1-0/+1
2017-01-06[ci skip] Don't set User-Agent header in CI_Email::clear()Andrey Andreev1-1/+0