summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-07-28Merge pull request #1640 from thecrypticace/developAlex Bilbie2-2/+25
Added support for IP Address Range Masks to the Proxy IPs config option
2012-07-27Change log for IPv4 range mask supportJordan Pittman1-1/+1
2012-07-27Improve change from f0ecb55dfe8dbfaf4c65dbe9d7e1bba8c131ebf4 and add ↵Andrey Andreev2-2/+2
changelog entries for pull #1654
2012-07-26If $htdocs = FALSE delete_files would never unlinkPhil Sturgeon1-1/+1
2012-07-26Merge pull request #1654 from Debeet/patch-1Alex Bilbie1-0/+2
Windows 8 and PlayStation 3 in user_agents.php
2012-07-25Windows 8 and PlayStation 3 in user_agents.phpDebeet1-0/+2
2012-07-23Merge pull request #1648 from vlakoff/page-cacheAndrey Andreev1-2/+2
output->_display_cache() simplifications
2012-07-23output->_display_cache() simplificationsvlakoff1-2/+2
remove an unneeded regex capturing group and an unneeded trim()
2012-07-23Merge pull request #1647 from vlakoff/page-cacheAndrey Andreev1-1/+1
output->_display_cache() optimization
2012-07-23output->_display_cache() optimizationvlakoff1-1/+1
faster method to remove the timestamp from the content to be served
2012-07-23Fix issue #1644Andrey Andreev2-1/+2
2012-07-23Fix a bug in CI_DB_sqlsrv_driver::affected_rows()Andrey Andreev2-1/+2
2012-07-23Update system/core/Input.phpJordan Pittman1-11/+17
2012-07-22Removing $reduce_linebreaks in auto_typography helper. Fixes #1642Eric Barnes1-2/+2
I researched this back to a commit by @derekjones but couldn't find any history on what the reason for it was or why it was even added. Signed-off-by: Eric Barnes <eric@ericlbarnes.com>
2012-07-22Merge pull request #1643 from firian/html-helper-comment-fixEric Barnes1-3/+3
Comment fix.
2012-07-22Comment fix. Html5 is most popular these days and should be added to ↵Przemyslaw Tomaszewski1-3/+3
comment. Also - information that there are more doctypes than specified in comment was not included.
2012-07-21Added support for IP Address Range Masks (e.g. 192.168.137.0/24) to the ↵Jordan Pittman1-2/+19
Proxy IPs config option
2012-07-19Enable travis for feature/* branchesAndrey Andreev1-1/+2
2012-07-18Merge pull request #1633 from vlakoff/htaccessAndrey Andreev3-3/+3
Improve the solution for issue #1631
2012-07-17Improve the solution for issue #1631vlakoff3-3/+3
.htaccess directives compatible with both Apache 2.2 and 2.4
2012-07-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Alex Bilbie2-2/+2
codeigniter/develop
2012-07-17Updated .htaccess files with Apache 2.4+ safe deny statements. Fixes #1631Alex Bilbie3-3/+18
2012-07-16Merge pull request #1627 from aroche/patch-1Andrey Andreev1-1/+1
Fix on _update_batch() : wrong variable used for field selection
2012-07-16Fix on _update_batch() : wrong variable used for field selectionaroche1-1/+1
2012-07-16Merge pull request #1625 from jonnu/developAndrey Andreev1-1/+1
Inconsistency between log_message and show_error when encountering a non-existant class
2012-07-16Inconsistency between log_message and show_error when encountering a ↵jonnu1-1/+1
non-existant class Signed-off-by: jonnu <jontce@gmail.com>
2012-07-15Changed TRUE and FALSE values to be uppercaseAlex Bilbie2-2/+2
2012-07-15Changed double quotes to single quotes to meet style guidelinesAlex Bilbie8-142/+142
2012-07-15Merge pull request #1621 from vlakoff/docAndrey Andreev1-1/+1
Fix in index.php inline documentation
2012-07-15Fix in index.php inline documentationvlakoff1-1/+1
$routing['controller'] has to respect the capitalization of the filename, which is in lowercase. Otherwise, the application fails on case-sensitive servers.
2012-07-13Merge pull request #1617 from vlakoff/docAndrey Andreev5-5/+5
Some adjustments in inline documentation
2012-07-13Some adjustments in inline documentationvlakoff5-5/+5
2012-07-13Merge pull request #1615 from joellimberg/patch-1Andrey Andreev1-2/+2
Rename $babe to $class, in foreach ($model AS $babe) {...}
2012-07-13Loader::model() - rename foreach ($model AS $single_model) to ($model AS ↵Joel Limberg1-2/+2
$class). Consistent with ::library() and ::_ci_load_class()
2012-07-13Add a changelog entry for issue #1605 (pull #1606) and remove some spacesAndrey Andreev2-4/+5
2012-07-13Merge pull request #1616 from appleboy/pageAndrey Andreev1-2/+2
fix issue #1605 covert page number type from float to int
2012-07-13fix issue #1605 covert page number type from float to intBo-Yi Wu1-2/+2
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2012-07-13Rename $babe => $single_model, in foreach ($model AS $babe) {...}joellimberg1-2/+2
2012-07-13escape_identifiers() to not escape string literals inside double quotes as wellAndrey Andreev1-1/+1
2012-07-13Fix issue #1613Andrey Andreev2-1/+7
2012-07-12Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon18-42/+38
2012-07-12Added data-ci-pagination-page="x" to pagination output so JS frameworks can ↵Phil Sturgeon1-7/+27
hook on.
2012-07-12Merge pull request #1609 from vkeranov/developPhil Sturgeon12-22/+13
helper fixes and small cleanup
2012-07-12Update developvkeranov1-1/+0
2012-07-12Update developvkeranov1-1/+0
2012-07-12Fix some spaces herevkeranov1-6/+5
2012-07-12again... new linesvkeranov1-1/+0
2012-07-12Too many new lines here :)vkeranov1-2/+1
2012-07-12Cleaning againvkeranov1-4/+3
2012-07-12Cleaning...vkeranov1-1/+0