summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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
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
2012-12-20fixes #2081 : fix change log entryAndrew Podner1-1/+1
2012-12-20fixes #2081 : change parameter/variable name to 'foreign_key_checks', update ...Andrew Podner5-31/+32
2012-12-19Resolves issue #2081 : provides an option to include statements to disable an...Andrew Podner4-14/+42
2012-12-19[ci skip] Some micro-optimizations and style changesAndrey Andreev2-24/+14
2012-12-19Merge pull request #2079 from AndrewPodner/developAndrey Andreev1-13/+82
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
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
2012-12-17update for Issue #2064 (changed docblocks which return $this or only call a m...Andrew Podner8-71/+71
2012-12-17Merge pull request #2069 from willmendesneto/developAndrey Andreev1-4/+6
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
2012-12-15Fix #2072Andrey Andreev1-1/+1
2012-12-14Minify output in css and javascript codeWill Mendes1-4/+6
2012-12-14Fix issue #539Andrey Andreev5-112/+152
2012-12-14Merge pull request #961 from cryode/feature/form_error_msgsAndrey Andreev3-125/+137
2012-12-13Remove slash!Eric Roberts1-1/+1
2012-12-12Find/replace oopsie.Eric Roberts1-2/+2
2012-12-12Format tweaksEric Roberts2-4/+4
2012-12-12Merge branch 'refs/heads/develop' into feature/form_error_msgsEric Roberts411-16493/+33705
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
2012-12-08While most of CodeIgniter supports protocol-relative URLs, a few URL helpers ...Aaron Adams1-3/+3
2012-12-08Added changelog entry.Aaron Adams1-0/+1