summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2016-01-07Fix MySQL's 'stricton' featureAndrey Andreev1-2/+20
2016-01-07Add support for MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERTAndrey Andreev2-4/+21
Available since PHP 5.6.16
2016-01-07[ci skip] Add changelog entry for #4279Andrey Andreev1-0/+1
2016-01-07[ci skip] Add Oracle 12.1 OFFSET support to PDO_OCI as wellAndrey Andreev1-0/+8
Reference: #4279
2016-01-07Merge branch 'feature/oci_offset' into 3.0-stableAndrey Andreev1-0/+8
2016-01-07Fix #4362Andrey Andreev3-5/+12
2016-01-06[ci skip] Add support for OFFSET with Oracle 12cAndrey Andreev1-0/+8
As requested in #4279
2016-01-06Fix #4337Andrey Andreev5-3/+50
2016-01-04Fix #4350Andrey Andreev2-1/+32
2016-01-02Merge pull request #4353 from paranic/patch-1Andrey Andreev1-1/+1
[ci skip] Docs typo correction
2016-01-02Merge pull request #4353 from paranic/patch-1Andrey Andreev1-1/+1
[ci skip] Docs typo correction
2016-01-01typo correction to avoid copy paste errorparanic1-1/+1
2015-12-30Merge pull request #4345 from murrion/developAndrey Andreev1-1/+1
[ci skip] Corrected step 21 number in 3.0.0 upgrade instructions
2015-12-30Merge pull request #4345 from murrion/developAndrey Andreev1-1/+1
[ci skip] Corrected step 21 number in 3.0.0 upgrade instructions
2015-12-30Fix #4343Andrey Andreev2-2/+2
2015-12-30Fix #4331Andrey Andreev2-13/+25
2015-12-29Renamed Step 20 to Step 21Gordon Murray1-1/+1
There were two Step 20's
2015-12-17Merge pull request #4318 from suhindra/developAndrey Andreev1-1/+2
[ci skip] Added Vivaldi browser to config/user_agents.php
2015-12-17added Vivaldi browserSuhindra1-1/+2
added new browser Vivaldi
2015-12-15Fix logical errors from af849696d43f5c3b68962af1ae5096151a6d9f1aAndrey Andreev3-4/+4
2015-12-15Really fix #4039Andrey Andreev1-1/+1
A typo from 8df6efd402180a6361b4dd619f5535d6c2bed334
2015-12-14Fix erroneous variables from 85bc9fc53e4c3e46b2f4e1b1eac7e2828d4869e6Andrey Andreev3-4/+4
2015-12-14Adjust test case for changes from 85bc9fc53e4c3e46b2f4e1b1eac7e2828d4869e6Andrey Andreev1-2/+0
2015-12-14Remove PHP 7 from allowed_failures in TravisAndrey Andreev1-1/+0
2015-12-14Remove PHP 7 from allowed_failures in TravisAndrey Andreev1-1/+0
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-05 20:44:11 +0100