summaryrefslogtreecommitdiffstats
path: root/application/config
AgeCommit message (Collapse)AuthorFilesLines
2011-08-21Merge commit 'v2.0.3' into workingFlorian Pritz3-2/+8
Conflicts: .gitignore application/views/welcome_message.php user_guide/changelog.html user_guide/database/active_record.html user_guide/database/caching.html user_guide/database/call_function.html user_guide/database/configuration.html user_guide/database/connecting.html user_guide/database/examples.html user_guide/database/fields.html user_guide/database/forge.html user_guide/database/helpers.html user_guide/database/index.html user_guide/database/queries.html user_guide/database/results.html user_guide/database/table_data.html user_guide/database/transactions.html user_guide/database/utilities.html user_guide/doc_style/index.html user_guide/general/alternative_php.html user_guide/general/ancillary_classes.html user_guide/general/autoloader.html user_guide/general/caching.html user_guide/general/cli.html user_guide/general/common_functions.html user_guide/general/controllers.html user_guide/general/core_classes.html user_guide/general/creating_drivers.html user_guide/general/creating_libraries.html user_guide/general/credits.html user_guide/general/drivers.html user_guide/general/environments.html user_guide/general/errors.html user_guide/general/helpers.html user_guide/general/hooks.html user_guide/general/libraries.html user_guide/general/managing_apps.html user_guide/general/models.html user_guide/general/profiling.html user_guide/general/quick_reference.html user_guide/general/requirements.html user_guide/general/reserved_names.html user_guide/general/routing.html user_guide/general/security.html user_guide/general/styleguide.html user_guide/general/urls.html user_guide/general/views.html user_guide/helpers/array_helper.html user_guide/helpers/captcha_helper.html user_guide/helpers/cookie_helper.html user_guide/helpers/date_helper.html user_guide/helpers/directory_helper.html user_guide/helpers/download_helper.html user_guide/helpers/email_helper.html user_guide/helpers/file_helper.html user_guide/helpers/form_helper.html user_guide/helpers/html_helper.html user_guide/helpers/inflector_helper.html user_guide/helpers/language_helper.html user_guide/helpers/number_helper.html user_guide/helpers/path_helper.html user_guide/helpers/security_helper.html user_guide/helpers/smiley_helper.html user_guide/helpers/string_helper.html user_guide/helpers/text_helper.html user_guide/helpers/typography_helper.html user_guide/helpers/url_helper.html user_guide/helpers/xml_helper.html user_guide/index.html user_guide/installation/downloads.html user_guide/installation/index.html user_guide/installation/troubleshooting.html user_guide/installation/upgrade_120.html user_guide/installation/upgrade_130.html user_guide/installation/upgrade_131.html user_guide/installation/upgrade_132.html user_guide/installation/upgrade_133.html user_guide/installation/upgrade_140.html user_guide/installation/upgrade_141.html user_guide/installation/upgrade_150.html user_guide/installation/upgrade_152.html user_guide/installation/upgrade_153.html user_guide/installation/upgrade_154.html user_guide/installation/upgrade_160.html user_guide/installation/upgrade_161.html user_guide/installation/upgrade_162.html user_guide/installation/upgrade_163.html user_guide/installation/upgrade_170.html user_guide/installation/upgrade_171.html user_guide/installation/upgrade_172.html user_guide/installation/upgrade_200.html user_guide/installation/upgrade_201.html user_guide/installation/upgrade_202.html user_guide/installation/upgrade_b11.html user_guide/installation/upgrading.html user_guide/libraries/benchmark.html user_guide/libraries/caching.html user_guide/libraries/calendar.html user_guide/libraries/cart.html user_guide/libraries/config.html user_guide/libraries/email.html user_guide/libraries/encryption.html user_guide/libraries/file_uploading.html user_guide/libraries/form_validation.html user_guide/libraries/ftp.html user_guide/libraries/image_lib.html user_guide/libraries/input.html user_guide/libraries/javascript.html user_guide/libraries/language.html user_guide/libraries/loader.html user_guide/libraries/output.html user_guide/libraries/pagination.html user_guide/libraries/parser.html user_guide/libraries/security.html user_guide/libraries/sessions.html user_guide/libraries/table.html user_guide/libraries/trackback.html user_guide/libraries/typography.html user_guide/libraries/unit_testing.html user_guide/libraries/uri.html user_guide/libraries/user_agent.html user_guide/libraries/xmlrpc.html user_guide/libraries/zip.html user_guide/license.html user_guide/nav/nav.js user_guide/overview/appflow.html user_guide/overview/at_a_glance.html user_guide/overview/cheatsheets.html user_guide/overview/features.html user_guide/overview/getting_started.html user_guide/overview/goals.html user_guide/overview/index.html user_guide/overview/mvc.html user_guide/toc.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-19make "contact me" on the main page optionalFlorian Pritz1-0/+2
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-13Fixed conflicts.Phil Sturgeon1-1/+1
2011-08-10Added application/x-csv as a mime.Phil Sturgeon1-1/+1
2011-08-10Disabled migrations by default.Phil Sturgeon1-1/+1
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones2-1/+44
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones11-53/+53
broke the Typography class's string replacements, for instance
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones11-53/+53
broke the Typography class's string replacements, for instance
2011-05-20modified the 'use_set_names' variable in the MySQL/i drivers to be a class ↵Derek Jones1-1/+2
property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files
2011-05-08Merged tip.Phil Sturgeon11-54/+60
2011-05-04Fixed conflict with migrations merge.Phil Sturgeon1-0/+42
2011-05-04Added Migration class and language file.Phil Sturgeon1-1/+5
2011-04-25Fixed double-space typo.Razican11-53/+53
2011-04-20Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorDerek Jones1-0/+6
2011-04-19modified MySQL and MySQLi drivers to address a potential SQL injection ↵Derek Jones1-0/+6
attack vector when multi-byte character set connections are employed. (Does not impact Latin-1, UTF-8, etc. encodings)
2011-04-19Removed APPPATH.'third_party' from the packages autoloader to negate ↵Greg Aker1-1/+1
needless file stats if no packages exist or if the developer does not load any other packages by default.
2011-04-10update to CI 2.0.2Florian Pritz4-6/+11
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-03-08Added 'json' to config/mimes.php.Phil Sturgeon1-1/+2
2011-02-16Merged CodeIgniter Core changes and integrated rob1's secure cookie change ↵Phil Sturgeon5-72/+93
into my secure cookie change.
2011-02-14Removed Migration code for now, will come back later.Phil Sturgeon1-38/+0
2011-02-11Adding config option to require 'secure' setting for all cookies- requires ↵Robin Sowell1-0/+2
https.
2011-02-09Fixed issue #41: Added audio/mp3 mime type to mp3.Phil Sturgeon1-1/+1
2011-02-07Added Migrations library, config and an example controller/migration file.Phil Sturgeon1-0/+38
2011-01-28update to CI 2.0Florian Pritz17-0/+1142
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
2011-01-27Automated merge with https://bitbucket.org/ellislab/codeigniterPhil Sturgeon5-73/+94
2011-01-17Accidentally left csrf to turned on in last commitEric Barnes1-1/+1
2011-01-17Added access scope to security library and added config options for csrf ↵Eric Barnes1-2/+8
protection
2011-01-12Changed instructions for location of log path. Fixes #305Eric Barnes1-1/+1
2011-01-11Reworked convert_foreign_characters in text helper. Thanks to Mario Ricalde.Eric Barnes1-52/+52
2011-01-06Altered User agent library so that is_browser(), is_mobile() and is_robot() ↵Phil Sturgeon1-0/+1
can optionally check for a specific browser or mobile device.
2011-01-05Added text/x-csv to mimes.php.Phil Sturgeon1-1/+1
2010-12-27Implemented GET string support from Dan Horrigan and modified it slightly. ↵Phil Sturgeon3-25/+48
Also tweaked his regex_match changes.
2010-12-15['404_override'] can now take methods and URI segments, not just a ↵Phil Sturgeon1-1/+8
controller name. This is useful for 404 pages on errors/page_missing or /pages/view/404.
2010-12-15<kbd>['base_url']</kbd> is now empty by default and will guess what it ↵Phil Sturgeon1-17/+20
should be.
2010-12-15Added full Query String and $_GET array support. This is enabled by ↵Dan Horrigan1-0/+4
default. Added a seperate config option to enable/disable the $_GET array.
2010-12-15Package paths can now be auto-loaded in autoload.php.Phil Sturgeon1-6/+19
2010-12-21Fix: #236 Adding audio/mpeg3 as a valid mime type for mp3Greg Aker1-1/+1
2010-12-15Package paths can now be auto-loaded in autoload.php.Phil Sturgeon1-6/+19
2010-10-07Automated merge with https://bitbucket.org/barrymieny/codeigniterDerek Jones1-2/+2
2010-10-07Fixed CSRF comments to avoid confusion.Shane Pearson1-2/+2
2010-10-04Cleanup of stray spaces and tabsBarry Mieny7-55/+55
2010-09-27added sess_expire_on_close to config file, corrected comment block for ↵Derek Jones1-5/+12
session config vars. Fixes #149
2010-08-31Added fatal error to Session class when no encryption key is set in the ↵Derek Jones1-2/+2
config file, for additional assurance that session manipulation can be prevented
2010-08-12single quotes instead of double quotes by default to prevent PHP from trying ↵Derek Allard1-14/+14
to parse a $ in a password as a variable.
2010-07-22Adding CSRF into configDerek Allard1-0/+11
Adding CSRF token into form open()
2010-07-08fixed a file location in an EOF commentDerek Jones1-1/+1
2010-03-25moved application folder outside of the system folderDerek Jones13-0/+1044