summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-11-28Merge commit 'v2.1.0'Florian Pritz64-496/+4293
Conflicts: 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/images/appflowchart.gif 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_203.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-11-27Merge pull request #710 from johnnicely/2.1-stablePhil Sturgeon2-1/+2
Changed form_open() to compare $action against base_url().
2011-11-24Changed form_open() to compare $action against base_url()John Nicely2-1/+2
Checking for strpos($action, $CI->config->site_url()) === FALSE causes CSRF token to not be added in form_open() output. When site_url()'s first parameter ($uri) is empty, site_url's return value is the base URL plus the $CI->config->item('index_page') value. form_open() and CodeIgniter's URI routing do not require index.php to be in the URL, so any call to form_open() in which the $action parameter does not have index.php will always return false for the strpos() call.
2011-11-24Added dummy _reset_select() method to CI_DB_Driver class to allow Active ↵Túbal Martín1-0/+14
Record class to be disabled. Otherwise a fatal error is triggered.
2011-11-23Merge pull request #697 from MVUG/upload-fixes-2.1Phil Sturgeon3-3/+20
Fixed bug in Upload library tmp_path does not exists, should be tmp_name.
2011-11-23dutch typoMichiel Vugteveen1-1/+1
2011-11-23changelog updatedMichiel Vugteveen1-0/+17
2011-11-23tmp_path does not exists, should be tmp_nameMichiel Vugteveen1-1/+1
2011-11-23docx and xlsx have a zip/application mimetypeMichiel Vugteveen1-2/+2
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
2011-11-18remove unused TODOFlorian Pritz1-0/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-11-18add install.phpFlorian Pritz2-0/+66
For now this only checks if some dependencies are install. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-11-18use full path to perl executable when calling mimetypeFlorian Pritz1-1/+1
Everywhere else we already do it like that. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-11-18don't display "latest client" link if there is no clientFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-11-14Merge branch 'release/2.1.0'Pascal Kriete202-731/+5366
Conflicts: user_guide/helpers/url_helper.html
2011-11-14Changelogging and setting release date.Pascal Kriete1-2/+3
2011-11-14Tweaking the xss filter for IE <comment> tags, parameter injection, and ↵Pascal Kriete1-50/+41
weird html5 attributes.
2011-11-14Removing stray docblocksPascal Kriete1-12/+0
2011-11-13More changelog tweaking.Phil Sturgeon1-0/+3
2011-11-13Added TLS and SSL support to Email library. Fixes issue #171Radu Potop1-1/+19
2011-11-13Resolved issue 65 - made action on form_open_multipart helper function call ↵Ben Edmunds1-1/+1
optional
2011-11-13Updated changelog.Phil Sturgeon1-9/+10
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-10Fix some typopurwandi1-2/+2
2011-11-10Modified repo from mercurial to git on User Guidepurwandi1-4/+4
2011-11-08Merge branch 'release/2.1.0' of github.com:EllisLab/CodeIgniter into ↵Phil Sturgeon1-1/+1
release/2.1.0
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-08Updating changelogAaron Kuzemchak1-0/+1
2011-11-08Enables real page numbers for URI segment in Pagination libraryAaron Kuzemchak2-13/+78
2011-11-05fix position of commentFlorian Pritz1-1/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-11-05Merge pull request #648 from daparky/release/2.1.0Phil Sturgeon1-1/+1
Changelog HTML fix.
2011-11-04The link to common functions wasn't closed properly under the 'Added ↵daparky1-1/+1
html_escape() to the Common functions' change.
2011-11-02Copied into GitHub from @kenjis 's bitbucket ↵saintnicster1-2/+37
repo.https://bitbucket.org/kenjis/ci-user-guide/changeset/3d579dd14afe
2011-11-02updated changelog messageShane Pearson1-1/+1
2011-11-02Fix #8 - Load core classes from the application folder first.Shane Pearson2-5/+5
2011-11-02Merge branch 'release/2.1.0' of github.com:EllisLab/CodeIgniter into ↵Phil Sturgeon1-1/+1
release/2.1.0
2011-11-02Resolved issue 167 - Input Class Userguide UpdateBen Edmunds1-9/+9
2011-11-01Merge pull request #640 from tmd45/release/2.1.0Greg Aker1-1/+1
fixed user_guide/database/results.html in Release/2.1.0
2011-11-01fix user_guide/database/results.html, unmodified variable '$user' to '$row'Yoko TAMADA1-1/+1
2011-10-31Fix broken <span> at beginning of highlighted diffFlorian Pritz1-2/+2
If a regex matches on lines that begin with a space, it will create a <span> tag directly at teh beginning of the code. The return statment removes the first char which in this case will be "<" so the html tag will be broken and there will be a left over space. If we don't add the space in the first place, we don't have to remove it. This looks like some crazy workaround, so it might cause problems to appear. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-31fix unified diff highlightingFlorian Pritz2-2/+12
We shouldn't recolor "ed commands" when they appear in a unified diff. To make this work we have to mark comment lines so the css selector can find them. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-31Misc formatting fixesTimothy Warren1-7/+8
2011-10-31Set charset in DSN if PHP >= 5.3.6Timothy Warren1-1/+7
2011-10-31Changed mysql charset to PDO optionTimothy Warren1-4/+7
2011-10-28add html_escape() function to escape HTML.kenjis3-0/+27
2011-10-27Added the 'user_data' key to the userdata property so that sessions using a ↵Kyle Farris1-1/+2
database can be deleted properly when using the table schema found in the "Saving Session Data to a Database" section of the Session Class in the user guide.
2011-10-27Changelog updated.Phil Sturgeon1-13/+10
2011-10-27Fixed issue #150 correctly.Phil Sturgeon2-6/+6
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-10-08 16:46:55 +0200