summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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
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
2012-12-06Updated formatting and styleguide, thanks narfbg;CJ1-7/+13
2012-12-06Bug fix for relative directory removalchernjie1-1/+20
2012-12-04Remove CI_DB_oci8_result::data_seek()Andrey Andreev1-63/+0
2012-12-04Rename DB_result _data_seek() to data_seek() and make it publicly availableAndrey Andreev11-25/+57
2012-12-03Added small improvement to the _remove_evil_attributes functionbrian9781-6/+5
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
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