summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-09Merge pull request #4445 from damiengrandi/developAndrey Andreev1-9/+9
[ci skip] Update QB phpdoc returns
2016-02-09fix a typo editDamien Grandi1-1/+1
2016-02-09Revert some previous changesDamien Grandi1-3/+3
2016-02-09Update DB_query_builder.php - phpdoc (some incorrect return type)Damien Grandi1-12/+12
Edit of some return type in phpdoc. This can also help to fix some autocompletion troubles in some IDE.
2016-02-06Merge pull request #4410 from ShrmnK/developAndrey Andreev5-22/+22
[ci skip] Consistent formatting of file paths and inline code in docs
2016-02-06Reverted formatting for non-variableSherman K1-1/+1
2016-02-05Merge pull request #4424 from jonty-comp/developAndrey Andreev1-3/+16
[ci skip] Fix PHP session_write_close() warning when writing a new session to Redis
2016-02-05Fix regression on PHP7 when regenerating the session (#4362)Jonty Sewell1-1/+3
2016-02-05Setting the flag to FALSE is unnecessary since it defaults to FALSE, ↵Jonty Sewell1-10/+1
therefore this block of code can be reduced to a single statement Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Set the _key_exists flag to TRUE when the key does in fact exist. Set it to ↵Jonty Sewell1-2/+7
FALSE if the ID is being regenerated, and set it to TRUE once it's been written. Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Add a flag to determine whether the redis key currently exists, and if not, ↵Jonty Sewell1-2/+17
force creation of it at write-time Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Revert previous changes - fixing the source of the problem rather than ↵Jonty Sewell1-9/+3
working around it Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-04Merge pull request #4434 from galdiolo/patch-14Andrey Andreev1-1/+1
[ci skip] Fix a comment
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-03If attempting to write an empty session to Redis, a key will not actually be ↵Jonty Sewell1-3/+9
created, so when the driver tries to set the expiration timeout on the key, 0 is returned, triggering a warning from session_write_close Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-02Merge pull request #4419 from EpicKris/hotfix/database-forge-unique-docAndrey Andreev1-4/+6
[ci skip] Added docs for UNIQUE keys in DBForge
2016-02-01Changed Unique ValueKristian Matthews1-1/+1
Changed unique value from false to true. Signed-off-by: Kristian Matthews <kristian.matthews@me.com>
2016-01-31Added Unique Field Attribute DocKristian Matthews1-4/+6
Signed-off-by: Kristian Matthews <kristian.matthews@me.com>
2016-01-29Merge pull request #4411 from kenjis/fix-upgrade_300-1Andrey Andreev1-4/+4
[ci skip] Fix formatting of paths in 3.0.0 upgrade instructions
2016-01-29Fix formatting of pathskenjis1-4/+4
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-01-29Consistent formatting of italicised file paths and inline code referencesSherman K5-23/+23
Signed-off-by: Sherman K <ShrmnK@users.noreply.github.com>
2016-01-28Merge pull request #4408 from ShrmnK/developAndrey Andreev1-1/+1
[ci skip] Fixed minor typographical error in DCO doc
2016-01-28Fixed minor typographical errorSherman K1-1/+1
Signed-off-by: Sherman K <ShrmnK@users.noreply.github.com>
2016-01-26Merge branch '3.0-stable' into developAndrey Andreev5-26/+64
2016-01-26Fix #4399Andrey Andreev2-15/+29
2016-01-25Fix #4395Andrey Andreev2-1/+16
2016-01-20[ci skip] Add changelog entry for PR #4384Andrey Andreev1-0/+1
2016-01-20[ci skip] Remove a trailing space from latest PR mergeAndrey Andreev1-1/+1
2016-01-20Respect $config['cur_page'] variable for paginationjekkos1-1/+5
After upgrading to CI3 I noticed that developers are able to determine the current page counter for pagination based on * Explicit query string parameters * URI segment configuration In earlier versions a developer could still set the current page counter in the pagination lib directly which is useful if you want to use pagination with HTTP POST instead of GET. This could be done by passing $config['cur_page'] = '10'; to the pagination function for link generation. Currently this code has changed and will always try to check whether the uri segment is a valid number or not, even if the cur_page variable was passed in the associative array, and fallback to zero if it fails to validate that result. This can be easily resolved by checking whether the counter was already set with a valid number from the $config array before trying to resolve it from the uri segment. This fix give a developer more flexibility and stop CI from overwriting the externally set value with an incorrect one. Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
2016-01-20[ci skip] Remove a trailing space from latest PR mergeAndrey Andreev1-1/+1
2016-01-20Merge pull request #4384 from jekkos/pagination-fixAndrey Andreev1-1/+5
Respect $config['cur_page'] variable for pagination
2016-01-20Respect $config['cur_page'] variable for paginationjekkos1-1/+5
After upgrading to CI3 I noticed that developers are able to determine the current page counter for pagination based on * Explicit query string parameters * URI segment configuration In earlier versions a developer could still set the current page counter in the pagination lib directly which is useful if you want to use pagination with HTTP POST instead of GET. This could be done by passing $config['cur_page'] = '10'; to the pagination function for link generation. Currently this code has changed and will always try to check whether the uri segment is a valid number or not, even if the cur_page variable was passed in the associative array, and fallback to zero if it fails to validate that result. This can be easily resolved by checking whether the counter was already set with a valid number from the $config array before trying to resolve it from the uri segment. This fix give a developer more flexibility and stop CI from overwriting the externally set value with an incorrect one. Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
2016-01-20Fix #4391Andrey Andreev2-7/+15
2016-01-20[ci skip] Fix a documentation error on output cache timesAndrey Andreev2-3/+3
2016-01-20[ci skip] Add changelog entry and upgrade instructions following PR #4389Andrey Andreev2-0/+14
2016-01-20Merge pull request #4389 from sebastienadam/default_html5Andrey Andreev2-4/+4
[ci skip] Change default doctype to HTML 5
2016-01-20Default doctype is now HTML 5Sébastien Adam2-4/+4
2016-01-13Merge pull request #4378 from jtneal/patch-1Andrey Andreev1-1/+1
[ci skip] Fix a defined() typo in config/constants.php
2016-01-13Merge pull request #4378 from jtneal/patch-1Andrey Andreev1-1/+1
[ci skip] Fix a defined() typo in config/constants.php
2016-01-13Fix type in default constants configurationJason Neal1-1/+1
The word "destructive" was misspelled in the conditional portion.
2016-01-13[ci skip] Merge branch '3.0-stable' into developAndrey Andreev4-4/+25
2016-01-13[ci skip] Mark the start of 3.0.5 developmentAndrey Andreev6-5/+27
2016-01-13[ci skip] Fix a changelog lineAndrey Andreev1-1/+1
2016-01-12[ci skip] 2016 in index.phpAndrey Andreev1-2/+2
2016-01-12[ci skip] 2016 in index.phpAndrey Andreev1-2/+2
2016-01-11[ci skip] Add changelog entry for PR #4269Andrey Andreev1-0/+4
2016-01-11Polish changes from PR #4269Andrey Andreev3-22/+50
2016-01-11Merge branch 'develop' of github.com:sebastienadam/CodeIgniter into ↵Andrey Andreev3-15/+20
feature/html_meta
2016-01-11[ci skip] Merge branch '3.0-stable' into developAndrey Andreev174-174/+174
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev174-174/+174
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-18 08:09:56 +0100