summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-06-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developAnton Lindqvist226-5502/+7922
Conflicts: system/libraries/Cache/Cache.php
2012-06-08Add a default _from_tables() method to CI_DB_query_builder and remove it ↵Andrey Andreev12-157/+23
from most of the drivers
2012-06-08Revert back some escape_identifiers() to proect_identifiers() as the first ↵Andrey Andreev12-28/+25
one can't handle arrays
2012-06-08Resolve formatting differences between DB forge driversAndrey Andreev10-222/+209
2012-06-08Merge pull request #1444 from cinan/093e9bdaa1b215a7e9190ab63d6131ee3ab8d726Phil Sturgeon1-4/+4
update Unit Tests readme
2012-06-07update vfsStream pear urlcinan1-4/+4
2012-06-07Resolve description docblock differences in system/language/Andrey Andreev12-29/+29
2012-06-07Add ics files support to mimes.php (issue #1441)Andrey Andreev2-3/+5
2012-06-07Merge pull request #980 from narfbg/develop-db-odbcAndrey Andreev3-115/+53
Improve the ODBC database driver
2012-06-07Merge upstream branchAndrey Andreev177-3465/+4386
2012-06-07Merge pull request #975 from narfbg/develop-db-sqlsrvAndrey Andreev4-65/+27
Improve the SQLSRV (MSSQL) database driver
2012-06-07Merge upstream branchAndrey Andreev181-4055/+6060
2012-06-07Merge pull request #972 from narfbg/develop-db-mssqlAndrey Andreev5-89/+49
Improve the MSSQL database driver
2012-06-07Add a changelog noteAndrey Andreev1-0/+1
2012-06-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-mssqlAndrey Andreev1-1/+1
2012-06-07Fix a syntax errorAndrey Andreev1-1/+1
2012-06-07Merge upstream branchAndrey Andreev179-3970/+6015
2012-06-07Merge pull request #978 from narfbg/develop-db-sqliteAndrey Andreev2-98/+40
Improve the SQLite database driver
2012-06-07Some more minor improvementsAndrey Andreev2-13/+8
2012-06-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqliteAndrey Andreev23-90/+114
2012-06-07Merge pull request #1440 from jjaffeux/patch-1Phil Sturgeon1-2/+0
Removed UserVoice link
2012-06-07Removed UserVoice linkJoffrey JAFFEUX1-2/+0
2012-06-07Merge pull request #1436 from jjaffeux/tests-text-helperAndrey Andreev1-1/+17
Tests text helper
2012-06-07Fix issue #861 (and previous commit, for that matter)Andrey Andreev3-5/+4
2012-06-07Added a work-around for MSSQL/SQLSRV create_table() with INT column types ↵Andrey Andreev3-2/+4
(column lengths are not supported)
2012-06-07Suppress errors from file_get_contents() in read_file()Andrey Andreev1-1/+1
2012-06-07Revert 296ab9a06e3c648de56861ad67581236a6dae71a - there's no bug to fixAndrey Andreev2-4/+3
2012-06-07Deprecated do_hash() and read_file() in favor of hash() and ↵Andrey Andreev8-43/+29
file_get_contents() respectively
2012-06-07Remove some unnecessary function_exists() checks and some minor improvementsAndrey Andreev5-26/+16
2012-06-07Merge pull request #1438 from IT-Can/form-helper-fixAndrey Andreev1-6/+9
Form helper fixes for issues triggered by 773ccc318f2769c9b7579630569b5d8ba47b114b
2012-06-07fixesMichiel Vugteveen1-3/+3
2012-06-06Merge pull request #1435 from jjaffeux/valid-ipv6Andrey Andreev3-1/+17
IPv6 support for CI_Input::valid_ip()
2012-06-06remove text about ipv4/ipv6 support in the docJoffrey Jaffeux1-1/+1
2012-06-06fixesMichiel Vugteveen1-4/+7
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux2-3/+4
2012-06-06removed ip_version()Joffrey Jaffeux4-45/+2
2012-06-06form_checkbox set_value fixMichiel Vugteveen1-2/+2
2012-06-06Merge pull request #1437 from ckdarby/issue_1374Andrey Andreev2-3/+4
Fixing extra td; Issue #1374
2012-06-06Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Cory13-179/+117
issue_1374 Conflicts: user_guide_src/source/changelog.rst
2012-06-06use an ip of the range 192.18.0.0/15Joffrey Jaffeux1-2/+2
2012-06-06Merge remote-tracking branch 'origin/master' into issue_1374Cory0-0/+0
2012-06-06styling guide false -> FALSEJoffrey Jaffeux1-1/+1
2012-06-06Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6Joffrey Jaffeux5-7/+21
Conflicts: user_guide_src/source/changelog.rst
2012-06-06Modifying changelog to reflect the changeCory1-0/+1
2012-06-06remove regex in favor of strposJoffrey Jaffeux1-2/+1
2012-06-06ip_version() now returns int instead of stringJoffrey Jaffeux2-5/+5
2012-06-06correction of the test and longer test stringJoffrey Jaffeux1-3/+3
2012-06-06typo word_wraped -> word_wrappedJoffrey Jaffeux1-4/+4
2012-06-06add test for word_wrap default charlimJoffrey Jaffeux1-2/+11
2012-06-06test for word_wrap()Joffrey Jaffeux1-0/+8
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 23:22:52 +0100