summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-08-15Remove change log entry for Bug fix #1695Eric Roberts1-1/+0
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-08-15Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developEric Roberts3-8/+12
2012-08-15Fix issue #1712Andrey Andreev1-1/+1
2012-08-15Add changelog entry for pull #1601Andrey Andreev1-6/+7
2012-08-14Merge pull request #1707 from IT-Can/fix-issue-1706Alex Bilbie1-1/+4
Fix issue #1706
2012-08-14fix issue 1706Michiel Vugteveen1-1/+4
2012-08-12Bug fix #1695 - change Nintendo mobile user agents to be more specific.Eric Roberts2-3/+4
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-08-03Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developEric Roberts33-254/+360
2012-08-01Merge pull request #1601 from rwillert/patch-1Phil Sturgeon1-1/+9
Reconnect to PostgreSQL database if connection dropped.
2012-07-31Added upgrade note about the breaking change in the email library. Problem ↵Alex Bilbie1-1/+13
noticed in #1671
2012-07-30Some clean-up and style changesAndrey Andreev4-16/+16
2012-07-30Merge pull request #1672 from alexbilbie/alexbilbie-email-clearEric Barnes3-4/+28
Automatically clear email parameters if send was successful
2012-07-30Updated changelogAlex Bilbie1-1/+3
2012-07-30Updated email library documentationAlex Bilbie1-0/+8
2012-07-30Only clear if request was successfulAlex Bilbie1-3/+3
2012-07-30New parameter to automatically clear the parametersAlex Bilbie1-3/+13
2012-07-30After sending an email clear the parametersAlex Bilbie1-2/+6
2012-07-29Merge pull request #1670 from CaSoft/developAndrey Andreev1-1/+6
Added documentation for mailto function
2012-07-29Merge pull request #1669 from EllisLab/feature/stringify_attributesEric Barnes6-83/+97
Feature/stringify attributes
2012-07-29Merge branch 'develop' of github.com:CaSoft/CodeIgniter into developInFog0-0/+0
2012-07-29Added documentation for mailto function.InFog1-1/+6
2012-07-29Added documentation for mail_to function.InFog1-1/+6
2012-07-29Fixed messed up welcome controller.Eric Barnes1-4/+1
Not sure how to revert this. Signed-off-by: Eric Barnes <eric@ericlbarnes.com>
2012-07-29Merge pull request #1668 from ShadesOfLight/feature/stringify_attributesEric Barnes1-21/+13
Feature/stringify attributes
2012-07-29Refactored _stringify_attributes in system/core/Common.phpChad Furman1-21/+13
2012-07-29refactored (crunched down) _stringify_attributesChad Furman1-1/+40
2012-07-29Refactored _stringify_attributes functionEric Barnes1-24/+22
Signed-off-by: Eric Barnes <eric@ericlbarnes.com>
2012-07-29Adding a common stringify_attributes function for dealing with attributes ↵Eric Barnes5-100/+88
through out various helpers. Signed-off-by: Eric Barnes <eric@ericlbarnes.com>
2012-07-28Adding optional attributes as array or object for html helperEric Barnes3-21/+60
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