summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2013-01-05Revert "Fix MSIE conditionals regex in minify output func"Michael Dodge1-921/+921
This reverts commit 8e12c787042396e172a7448c65bd16c3015ffb0f.
2013-01-05Fix MSIE conditionals regex in minify output funcMichael Dodge1-921/+921
Allows IE conditionals like the following to remain unmodified. <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> Credit to joebert regex from http://www.sitepoint.com/forums/showthread.php?696559-Regex-pattern-to-strip-HTML-comments-but-leave-conditonals&s=3eef4ceb0a59b2fdb946fa56220fb6fd&p=4678083&viewfull=1#post4678083
2013-01-03Replaced array_push function reference with a faster ordinary element ↵and-ers1-1/+1
insertion method
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 Andreev162-162/+162
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-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-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 Andreev3-13/+13
2012-12-20Merge pull request #2087 from AndrewPodner/developAndrey Andreev3-7/+34
Resolves issue #2081 : Foreign Key Checks
2012-12-20fixes #2081 : change parameter/variable name to 'foreign_key_checks', update ↵Andrew Podner3-16/+16
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 Podner3-1/+28
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-18Replaced spaces with tabs for indentation and || with ORbrian9781-9/+9
2012-12-18Merge remote-tracking branch 'upstream/develop' into developbrian97812-113/+147
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 Andreev1-1/+1
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 Andreev2-30/+36
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-12Find/replace oopsie.Eric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Format tweaksEric Roberts1-2/+2
Signed-off-by: Eric Roberts <eric@cryode.com>
2012-12-12Merge branch 'refs/heads/develop' into feature/form_error_msgsEric Roberts173-12099/+22244
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-10Fixed bug with regexp that matched tagsbrian9781-1/+1
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_xssbrian97812-84/+51
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-07Fix issue #2061Andrey Andreev1-9/+9
2012-12-06Another use of CI_URI::_remove_relative_directory()Andrey Andreev1-1/+1
2012-12-06Updated formatting and styleguide, thanks narfbg;CJ1-7/+13