summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev187-352/+352
2016-01-11Alter a valid URL testAndrey Andreev1-1/+1
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev186-350/+350
2016-01-11[ci skip] Update webchat link in readmeAndrey Andreev1-1/+1
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev176-350/+350
2016-01-11[ci skip] Bump year to 2016Andrey Andreev176-350/+350
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev16-43/+242
Resolved conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php
2016-01-11Fix #4374Andrey Andreev2-0/+13
2016-01-11Merge pull request #4371 from feryardiant/contrib/mime-oggAndrey Andreev1-1/+1
[ci skip] Add extra mime for .ogg files
2016-01-11Merge pull request #4241 from suhindra/developAndrey Andreev1-1/+2
[ci skip] Added/updated MIME types for Flash Video
2016-01-11Merge pull request #4371 from feryardiant/contrib/mime-oggAndrey Andreev1-1/+1
[ci skip] Add extra mime for .ogg files
2016-01-11Merge pull request #4369 from galdiolo/patch-12Andrey Andreev1-10/+6
Optimize transactions check in CI_DB_driver::query()
2016-01-11Merge pull request #4369 from galdiolo/patch-12Andrey Andreev1-10/+6
Optimize transactions check in CI_DB_driver::query()
2016-01-09Add extra mime for .ogg fileFery Wardiyanto1-1/+1
Signed-off-by: Fery Wardiyanto <ferywardiyanto@gmail.com>
2016-01-08use 'while' instead of 'if' 'do' 'while'Claudio Galdiolo1-10/+6
2016-01-08Merge pull request #4365 from ponsfrilus/developAndrey Andreev1-2/+2
[ci skip] Form helper examples missing ; at end of function calls
2016-01-08Merge pull request #4365 from ponsfrilus/developAndrey Andreev1-2/+2
[ci skip] Form helper examples missing ; at end of function calls
2016-01-08[typo] missing ; at end of PHP lines 464 and 469ponsfrilus1-2/+2
2016-01-07MySQL stricton again ... remove the version conditionAndrey Andreev3-3/+3
Ref: #4349
2016-01-07Fix MySQL errors from latest commitsAndrey Andreev3-3/+3
Ref: #4349
2016-01-07[ci skip] Add changelog entries for #4349Andrey Andreev1-0/+2
2016-01-07Add MySQL stricton changes to mysqli and pdo/mysql driversAndrey Andreev3-20/+55
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-08 16:40:52 +0100