summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-12-18Merge remote-tracking branch 'upstream/develop' into developbrian97815-290/+349
2012-12-17[ci skip] Fix some spacesAndrey Andreev2-2/+2
2012-12-17Merge pull request #2077 from AndrewPodner/developAndrey Andreev8-71/+71
update for Issue #2064 - take 2
2012-12-17update for Issue #2064 (changed docblocks which return $this or only call a ↵Andrew Podner8-71/+71
method that returns $this to @return CI_DB_class_name)
2012-12-17Merge pull request #2069 from willmendesneto/developAndrey Andreev1-4/+6
Minify output in css and javascript code
2012-12-17Fix 2073Andrey Andreev2-4/+4
2012-12-17Fix #2074Andrey Andreev1-1/+1
2012-12-17Fix function_usable()Andrey Andreev1-6/+11
2012-12-15Fix #2072Andrey Andreev1-1/+1
2012-12-14Minify output in css and javascript codeWill Mendes1-4/+6
Minify output in css and javascript code
2012-12-14Fix issue #539Andrey Andreev5-112/+152
Form validation language line keys were not prefixed. They are now prefixed with 'form_validation_' in order to avoid collisions. The old keys will still work if a prefixed match is not found, but are DEPRECATED and will be removed in the next major version. Also added upgrade notes and changelog entries for the new error message format from PR #961.
2012-12-14Merge pull request #961 from cryode/feature/form_error_msgsAndrey Andreev3-125/+137
Improved form validation rule error messages.
2012-12-13Remove slash!Eric Roberts1-1/+1
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Find/replace oopsie.Eric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Format tweaksEric Roberts2-4/+4
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Merge branch 'refs/heads/develop' into feature/form_error_msgsEric Roberts411-16493/+33705
Conflicts: system/language/english/form_validation_lang.php user_guide_src/source/libraries/form_validation.rst Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-11Modified regexp to match partial tagsbrian9781-2/+2
2012-12-10Removed boundary from regexpbrian9781-1/+1
2012-12-10Merge branch 'dev/xss' into developbrian9781-1/+1
2012-12-10Fixed bug with regexp that matched tagsbrian9781-1/+1
2012-12-09Merge remote-tracking branch 'upstream/develop' into developbrian97814-96/+92
2012-12-08All the HEX code must be replaced or else some XSS attacks can be successfulbrian9781-3/+11
2012-12-08All the HEX code must be replaced or else some XSS attacks can be successfulbrian9781-3/+11
2012-12-08Merge remote-tracking branch 'upstream/develop' into dev/hex_xssbrian97814-96/+92
2012-12-08Merge pull request #2059 from aaronadamsTO/developAndrey Andreev2-3/+4
Fix URL helpers to recognize protocol-relative URLs.
2012-12-08While most of CodeIgniter supports protocol-relative URLs, a few URL helpers ↵Aaron Adams1-3/+3
do not. Most notably, redirect('//www.facebook.com/aaronadams') led my browser to https://aaronadams.ca/index.php/www.facebook.com/aaronadams. In this commit, I have fixed the header() helper, along with the anchor() and anchor_popup() helpers, to be compatible with protocol-relative URLs. Signed-off-by: Aaron Adams <aaron@aaronadams.ca>
2012-12-08Added changelog entry.Aaron Adams1-0/+1
Signed-off-by: Aaron Adams <aaron@aaronadams.ca>
2012-12-07[ci skip] Correct a changelog entryAndrey Andreev1-1/+1
2012-12-07Fix issue #2061Andrey Andreev2-9/+10
2012-12-06Another use of CI_URI::_remove_relative_directory()Andrey Andreev1-1/+1
2012-12-06Merge pull request #2055 from chernjie/developAndrey Andreev1-1/+26
Bug fix for relative directory removal
2012-12-06Updated formatting and styleguide, thanks narfbg;CJ1-7/+13
2012-12-06Bug fix for relative directory removalchernjie1-1/+20
This fixes two bugs: - for segments that ends with ".." e.g. /user/username../details, this should not be replaced - current solution only replace double slashes, this solutions removes the infinite number of recurring slashes
2012-12-04Remove CI_DB_oci8_result::data_seek()Andrey Andreev1-63/+0
It can only call oci_execute() in order to reset the pointer to 0, the oci8 driver doesn't support setting the pointer. Due to the result_object(), result_array() and custom_result_object() calling data_seek() every time prior to fetching the result set, this only causes the query to be executed twice. All of the three methods now cast from existing result_object and/or result_array sets, so the probability to ever need to really fetch the result set again is practically zero and so this method doesn't bring any benefit.
2012-12-04Rename DB_result _data_seek() to data_seek() and make it publicly availableAndrey Andreev11-25/+57
(as requested in #2050)
2012-12-03Added small improvement to the _remove_evil_attributes functionbrian9781-6/+5
Signed-off-by: brian978 <dbrian89@yahoo.com>
2012-12-03Fix postgre db_connect()Andrey Andreev1-6/+6
2012-12-03Add min_width and min_height options to the Upload classAndrey Andreev4-48/+109
(manually implementing outdated PR #636)
2012-12-03Improve schema support for PostgreAndrey Andreev3-12/+44
2012-12-03[ci skip] Cleaned some spacesAndrey Andreev46-93/+85
2012-12-03Merge pull request #2048 from vlakoff/developAndrey Andreev1-7/+10
config->site_url() optimizations
2012-12-03config->site_url(): remove useless castvlakoff1-1/+1
thanks to narfbg
2012-12-03config->site_url() optimizationsvlakoff1-7/+10
- direct access to config array, instead of item() calls - the string cast is just in case 'url_suffix' would be set to false or null; the function produces the same results without this cast, but it leads to a robuster code, as false and null are sanitized and skip the suffix insertion code - altered conditional structure: if no suffix, skip the appending of an empty string to $uri
2012-11-30Merge pull request #2043 from johnathancroom/keep_flash_data_arrayAndrey Andreev1-0/+50
Test for keep_flashdata accepting an array
2012-11-30keep_flashdata array testJohnathan Croom1-1/+51
2012-11-30Add CI_Output::delete_cache()Andrey Andreev3-4/+51
(an improved version of PR #609)
2012-11-29Fix #2041Andrey Andreev3-21/+25
2012-11-29Added CI_Output::get_header()Andrey Andreev4-7/+96
(an improved version of PR #645) Also fixed get_content_type() to only return the MIME value and created Output library unit tests for both of these methods.
2012-11-28Fix #2037Andrey Andreev1-6/+8
2012-11-28Merge pull request #2036 from williamknauss/developAndrey Andreev1-3/+10
Children Drivers