summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-03-26Merge pull request #2361 from thefuzzy0ne/fix/userguideAndrey Andreev1-1/+1
There are 21 preferences, not 17
2013-03-26There are 21 preferences, not 17Darren Benney1-1/+1
2013-03-25Merge pull request #2352 from bayssmekanique/developAndrey Andreev1-1/+0
Fixed error in Form Helper textarea function
2013-03-24Fixed error in form_textarea helper functionZachary Cardoza1-1/+0
Reverted from GitHub edited version to remove document line end character. Good to merge now.
2013-03-24Revert "Fixed error in Form Helper textarea function"Zachary Cardoza1-1/+2
This reverts commit e15d1be514dad1df7a3c38d6265566692ecf1260.
2013-03-22Fixed error in Form Helper textarea functionZach Cardoza1-2/+1
Function had declaration of unused $name variable which caused errors.
2013-03-21Merge pull request #2350 from ragboyjr/developAndrey Andreev1-7/+2
Making a performance modification to DB_driver list_fields()
2013-03-21Making a performance modification to DB_driver list_fields()RJ garcia1-7/+2
Signed-off-by: RJ garcia <rj@bighead.net>
2013-03-15Fix MSSQL ALTER TABLE ADD statementAndrey Andreev1-1/+5
An improved version of PR #2329
2013-03-13Merge pull request #2328 from samdoidge/developAndrey Andreev1-1/+1
adding thumb_marker to image_lib->clear()
2013-03-13Merge pull request #2326 from bayssmekanique/developAndrey Andreev1-0/+2
Output Class Minify Function Change
2013-03-13removing linebreakSam Doidge1-1/+1
2013-03-13adding thumb_marker to image_lib->clear()Sam Doidge1-2/+2
2013-03-12Output Class Minify Function Changebayssmekanique1-0/+2
Added 2 additional MIME types to match against for JavaScript detection.
2013-03-12Add a (default) CI_DB_query_builder::_update_batch() methodAndrey Andreev5-164/+41
An improved version of PR #2324, which only targets ODBC.
2013-03-12Fix #2320Andrey Andreev1-3/+3
2013-03-06Merge pull request #2305 from vlakoff/developAndrey Andreev1-1/+1
Fix a typo in changelog.rst
2013-03-06Fix a typo in changelog.rstvlakoff1-1/+1
This missing space was broking the link generation.
2013-03-06Merge pull request #2304 from vlakoff/developAndrey Andreev2-2/+18
Documentation: update reserved names list
2013-03-05Documentation: another update to reserved names listvlakoff2-1/+7
Added missing user functions. Also fixed a typo in common_functions.rst.
2013-03-05Documentation: update reserved names listvlakoff1-1/+11
Added constants from 50dfe0175df02fe4aa243757bdf1b42fb9fc3169 (exit status codes)
2013-03-04Merge pull request #2300 from vlakoff/developAndrey Andreev1-1/+1
Cache file driver: clean() now preserves .htaccess and index files
2013-03-04Fix #2301Andrey Andreev1-2/+1
2013-03-04Cache file driver: clean() now preserves .htaccess and index filesvlakoff1-1/+1
2013-03-04Merge pull request #2190 from danhunsaker/feature/exit-statusAndrey Andreev9-20/+93
Updated all CLI-valid cases of exit() to return a valid code
2013-03-04[ci skip] Fix #2289Andrey Andreev1-3/+2
2013-03-04Reverting changes to functions that have no business being used in CLI apps ↵Daniel Hunsaker4-17/+10
to begin with Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-03-04Oops, missed a few places where EXIT_SUCCESS was being used.Daniel Hunsaker4-5/+5
Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-03-04Updated in accordance with feedback from @narfbgDaniel Hunsaker8-109/+38
- Removed commented lists of constants from the three reference conventions, replacing each with the URLs at which more information can be found. - Renamed a few constants to more closely reflect CodeIgniter conventions. - Modified a couple of lines which were in violation of the CI Style Guide. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Daniel Hunsaker8-100/+55
feature/exit-status
2013-03-04Fix #2298Andrey Andreev2-6/+4
2013-03-03Merge pull request #2295 from k3mist/fix-user-agent-matchAndrey Andreev1-1/+1
Fix Session cookie driver storing untrimmed user agent string in the dat...
2013-03-02Fix Session cookie driver storing untrimmed user agent string in the ↵Daniel Robbins1-1/+1
database causing set_userdata() calls to fail when $config['sess_match_useragent'] = TRUE Signed-off-by: Daniel Robbins <github@danieljrobbins.com>
2013-03-01Merge pull request #2287 from vlakoff/developAndrey Andreev1-1/+1
Fix this use case: load->vars->('foobar', '')
2013-03-01Optimize changes from PR #2290Andrey Andreev1-4/+2
2013-03-01Merge pull request #2290 from jonesmdj/developAndrey Andreev1-1/+3
Remove trailing delimiters from csv_from_result
2013-03-01Merge pull request #2294 from vlakoff/develop-2Andrey Andreev1-5/+8
Text helper: convert_accented_characters() optimization
2013-02-28Text helper: convert_accented_characters() optimizationvlakoff1-5/+8
Thanks to static variables, array_keys() and array_values() are now executed once only.
2013-02-28added spaces after the parameter separatorsMichelle Jones1-2/+2
2013-02-28[ci skip] Add application/x-zip for OpenOffice docs in ↵Andrey Andreev1-2/+2
application/config/mimes.php
2013-02-27Remove trailing delimiters from csv_from_resultMichelle Jones1-1/+3
When using the csv_from_result function, the returned string includes an extra delimiter at the end of every line, usually a comma unless another delimiter is specified. A simple addition of a couple of lines to remove the extra delimiter from the column names and the data rows is included. (Lines 241 and 251)
2013-02-27Fix this use case: load->vars->('foobar', '')vlakoff1-1/+1
Previously, only the other syntax was working: load->vars->(array('foobar' => ''))
2013-02-26Merge pull request #2282 from cryode/bug/styleguideAndrey Andreev1-83/+37
Fix #2277, update Style Guide page.
2013-02-26Style guide PR tweaks.Eric Roberts1-8/+8
2013-02-25Update Style Guide page.Eric Roberts1-83/+37
2013-02-23Updated exit codes as constant valuesDaniel Hunsaker14-25/+158
Re-allocated exit status codes according to three references, which follow: BSD sysexits.h:http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits GNU recomendations:http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html Bash scripting:http://tldp.org/LDP/abs/html/exitcodes.html The GNU recommendations stem from and expand upon the standard C/C++ library (stdlibc) definitions, while also suggesting some best-practice conventions which happen to prevent exit status code collisions with bash, and probably other shells. The re-allocated codes are now mapped to constant values, set in *application/config/constants.php*, and used throughout the CodeIgniter core. They would additionally be used in *index.php*, but the constants file hasn't been loaded at that point, so the integer values are used instead, and a comment follows each such use with amplifying information on why that particular value was selected. Finally, the errors documentation has been updated accordingly. Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-02-22Merge branch 'develop' of github.com:EllisLab/CodeIgniter into ↵Daniel Hunsaker68-491/+710
feature/exit-status
2013-02-21CI_Output [set/append/get]_output() testsAndrey Andreev1-0/+35
2013-02-21Some miscellaneous testsAndrey Andreev1-1/+24
2013-02-21Add CI_Utf8::convert_to_utf8() testAndrey Andreev1-0/+20