summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-01-04Merge pull request #2111 from carneeki/developAndrey Andreev1-1/+1
fix a typo in index.php
2013-01-03Replaced array_push function reference with a faster ordinary element ↵and-ers2-2/+2
insertion method
2013-01-03fix a typo in index.phpAdam Carmichael1-1/+1
2013-01-03Merge pull request #2075 from sourcejedi/patch-1Andrey Andreev1-5/+5
doc: xss_clean() method is in Security, not Input
2013-01-03doc: fix table markup in previous commitAlan Jenkins1-3/+3
"These "border lines" need to have a length higher or equal to the longest line in the table that would be generated, so you'll have to update them as well." - narfbg
2013-01-03Fix #2108Andrey Andreev1-1/+1
2013-01-03Merge pull request #2106 from danhunsaker/feature/uri-extensibilityAndrey Andreev1-12/+2
Improved extensibility of the URI class
2013-01-01[ci skip] Happy new yearAndrey Andreev187-210/+210
2012-12-31Merge pull request #2107 from danhunsaker/feature/header-normalizationAndrey Andreev1-1/+1
Fixed normalization of headers under Apache
2012-12-31Fixed normalization of headers under ApacheDaniel Hunsaker1-1/+1
The existing header normalization routine converts headers provided by Apache (that is, with `-` in the name instead of `_`) to all lowercase, with the exception of the first character. This is different from the expected result, wherein each word of the header is capitalized. For example, `CONTENT-LENGTH` would normalize to `Content-length` instead of the expected `Content-Length`. The reason for this is that the existing code is only converting underscores to spaces, and leaving hyphens untouched. The fix is to replace hyphens with spaces as well before passing the result through `ucwords()`. That fix is included here. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2012-12-31Improved extensibility of the URI class by modifying `_uri_assoc()` to (1) ↵Daniel Hunsaker1-12/+2
not force a specific list of valid options for `$which`, and (2) build the `$segment_array` and `$total_segments` dynamically regardless of the contents of `$which`. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2012-12-28Update CI_Output::get_header() testAndrey Andreev1-2/+2
2012-12-28Minor improvements to the Output classAndrey Andreev1-10/+14
2012-12-28Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developAndrey Andreev1-7/+57
2012-12-28Merge pull request #2097 from AndrewPodner/feature-minifyAndrey Andreev1-7/+57
issue #2092 : Improve/Revise JS and CSS minify method
2012-12-28issue #2092 : code refinementsAndrew Podner1-6/+4
2012-12-26issue #2092 : Improve/Revise JS and CSS minify method (code refinements)Andrew Podner1-2/+2
2012-12-26issue #2092 : Improve/Revise JS and CSS minify methodAndrew Podner1-1/+1
2012-12-26issue #2092 : Improve/Revise JS and CSS minify methodAndrew Podner1-17/+12
2012-12-25issue #2092 : Improve/Revise JS and CSS minify methodAndrew Podner1-7/+64
2012-12-20[ci skip] Minor style/spacing changes following PR #2087Andrey Andreev4-14/+14
2012-12-20Merge pull request #2087 from AndrewPodner/developAndrey Andreev5-34/+63
Resolves issue #2081 : Foreign Key Checks
2012-12-20fixes #2081 : fix change log entryAndrew Podner1-1/+1
Signed-off-by:Andrew Podner <a.podner@me.com>
2012-12-20fixes #2081 : change parameter/variable name to 'foreign_key_checks', update ↵Andrew Podner5-31/+32
change log Signed-off-by:Andrew Podner <a.podner@me.com>
2012-12-19Resolves issue #2081 : provides an option to include statements to disable ↵Andrew Podner4-14/+42
and re-enable foreign key checks in a MySQL database backup output statement.
2012-12-19[ci skip] Some micro-optimizations and style changesAndrey Andreev2-24/+14
(following PRs #2049, #2079)
2012-12-19Merge pull request #2079 from AndrewPodner/developAndrey Andreev1-13/+82
Issue #2078: refinement of the minify function for CSS and scripts.
2012-12-19fixes #2078: changing type variable to boolean in protected methodAndrew Podner1-6/+6
2012-12-18fixes #2078: formatting / styleguide cleanup (take2)Andrew Podner1-1/+1
2012-12-18fixes #2078: formatting / styleguide cleanupAndrew Podner1-7/+7
2012-12-18fixes #2078: refinement of the minify function for CSS and scripts.Andrew Podner1-134/+134
2012-12-18Merge pull request #2049 from brian978/developAndrey Andreev1-10/+17
Added small improvement to the _remove_evil_attributes function
2012-12-18Replaced spaces with tabs for indentation and || with ORbrian9781-9/+9
2012-12-18Merge remote-tracking branch 'upstream/develop' into developbrian97815-290/+349
2012-12-18Issue #2078: refinement of the minify function for CSS and scripts.Andrew Podner1-73/+142
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-16doc: xss_clean() method is in Security, not InputAlan Jenkins1-2/+2
The Input doc does talk about xss filtering, but they refer you to Security for details, which is where the function is actually defined. It gives more detail about what the function is supposed to do, and avoids some irrelevance. It's probably not a big deal; it just looks wrong. It _might_ have been responsible for [confusion](http://stackoverflow.com/questions/13570522/this-input-xss-cleandata-giving-fatal-error-with-codeigniter) sometimes.
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>