summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-04-01Removed newline at EOFDarren Benney1-1/+1
2013-03-30Changed spaces to tabs for consistency.Darren Benney1-8/+8
2013-03-30Added description to composer.jsonDarren Benney1-3/+4
When executing "composer validate", an error is generated because there is no description. Also removed a couple of tabs and replaced them with spaces to neaten it up slightly.
2013-03-29Merge pull request #2366 from vlakoff/developAndrey Andreev1-1/+1
index.php: minor improvement in VIEWPATH definition code
2013-03-29index.php: minor improvement in VIEWPATH definition codevlakoff1-1/+1
Fixes an oversight from 806ca600d3669343ee7ae90a9b5d65be9dfdbefe
2013-03-29Merge pull request #2365 from vlakoff/developAndrey Andreev5-6/+6
Documentation: fix some outdated paths
2013-03-29Documentation: fix some outdated pathsvlakoff5-6/+6
2013-03-29Fix #2353Andrey Andreev2-2/+6
2013-03-26Merge pull request #2348 from nisheeth-barthwal/feature/nested_keysAndrey Andreev4-12/+50
Added Parsing Capabilities to Input class for nested array keys
2013-03-26Code style fixnisheeth-barthwal1-1/+1
2013-03-26Code fixes in line with suggestionsnisheeth-barthwal2-15/+11
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-25Simplified notation parsing and other cosmetic fixesnisheeth-barthwal2-63/+18
2013-03-25Merge pull request #2352 from bayssmekanique/developAndrey Andreev1-1/+0
Fixed error in Form Helper textarea function
2013-03-25Changed "else if" to "elseif"nisheeth-barthwal1-1/+1
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-23Removed $recurse parameter in lieu of auto parsing. Changed "provision" entry.nisheeth-barthwal3-21/+15
2013-03-22Fixed error in Form Helper textarea functionZach Cardoza1-2/+1
Function had declaration of unused $name variable which caused errors.
2013-03-21Removed entry for erroneous bugfixnisheeth-barthwal1-1/+0
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-21Added array notation for keys in Input librarynisheeth-barthwal4-21/+114
2013-03-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developnisheeth-barthwal22-195/+165
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-04Fixed #2289nisheeth-barthwal2-1/+2
2013-03-04reverted changes from previous commitnisheeth-barthwal0-0/+0
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