summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-06-13Revert "Fix issue #1387"Florian Pritz2-14/+12
This reverts commit bc602d8b8e125597bfd557949e846ff5a258b858. This break the session cleanup. References: https://github.com/EllisLab/CodeIgniter/issues/1387#issuecomment-6307876 Conflicts: user_guide/changelog.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-06-13Revert "Fix an erroneus method name"Florian Pritz1-1/+1
This reverts commit 9b655400c9519407d1d33a75323b9f4fdac42766.
2012-06-13Merge tag '2.1.1'Florian Pritz15-87/+322
Retagging 2.1.1 for final release 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/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_210.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/migration.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/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 user_guide/tutorial/conclusion.html user_guide/tutorial/create_news_items.html user_guide/tutorial/hard_coded_pages.html user_guide/tutorial/index.html user_guide/tutorial/news_section.html user_guide/tutorial/static_pages.html Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-06-13Updated downloads page in docs to increment versionsDerek Jones1-1/+2
2012-06-13Updating version number and release date for 2.1.1Derek Jones140-140/+140
2012-06-12fix missing negation in deleteFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-06-09detect new curl user agentFlorian Pritz1-1/+1
curl 7.26.0 changed the user agent format to "curl/$version" and no longer sends the library version. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-06-07Revert a changeAndrey Andreev1-1/+1
2012-06-07Fixed valid_ip() for PHP < 5.2Andrey Andreev1-22/+21
2012-06-07Documenting IPv6 changes and adding update notes.Pascal Kriete4-1/+94
2012-06-07Adding IPv6 support to the Input and Form_validation libraries.Pascal Kriete4-7/+136
2012-05-27Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stablePhil Sturgeon1-1/+1
2012-05-27Driver_Library had $lib_name set as static, and used non-staticPhil Sturgeon1-1/+1
2012-05-27Fix an erroneus method nameAndrey Andreev1-1/+1
2012-05-24Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stablePhil Sturgeon5-15/+18
2012-05-24Stop travis trying to run unit tests on 2.1-stable.Phil Sturgeon1-0/+4
2012-05-24Fix issue #1387Andrey Andreev3-14/+16
2012-05-24Merge pull request #1389 from jamiefdhurst/2.1-stablePhil Sturgeon2-1/+2
Adding width and height to list of clear variables to fix #1059
2012-05-24Updating change log relating to #1059.Jamie Hurst1-0/+1
2012-05-24Adding width and height to list of clear variables to fix #1059Jamie Hurst1-1/+1
2012-05-23Removed the starting slash from uri_string() documentation.Phil Sturgeon1-1/+1
2012-05-23Added ability to _like paramater side to use 'none', in case one wants to ↵Nithin1-2/+6
query like instead of where without case being sensitive
2012-05-20Merge pull request #1331 from rogeriopradoj/patch-1Phil Sturgeon3-3/+25
Workaround for PDO Driver in 2.1-stable: num_rows doesn't work for SELECT queries
2012-05-19Fix a issue with CI_DB_pdo_result::num_rows()Rogerio Prado de Jesus2-1/+13
In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit makes it returns the expected value.
2012-05-19Fix a issue with affect_rows in CI_DB_pdo_driver::_execute()Rogerio Prado de Jesus2-2/+12
In case of SELECT queries PDOStatement::rowCount doesn't work as expected. This commit makes affect_rows be initialized properly. Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
2012-05-19Fix issue #726Andrey Andreev2-8/+9
2012-05-17Move some functions from file_mod to file controllerFlorian Pritz3-212/+210
Models shouldn't really call views Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-17improve is_cli_client() and use everywhereFlorian Pritz3-17/+23
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-17Merge pull request #1366 from aphofstede/2.1-stableAndrey Andreev2-1/+2
Check cookie against md5 regex. 2.1 stable CSRF injection security fix
2012-05-17Use tabs for indentingAlexander Hofstede1-1/+1
2012-05-17Revert "Use tab for indent"Alexander Hofstede3-16/+1
This reverts commit c3eb672ed01c57a543dd8cdf1b90eb4001498c19.
2012-05-17Use tab for indentAlexander Hofstede3-1/+16
2012-05-17Check cookie against md5 regex.Alexander Hofstede2-1/+2
Otherwise, cookie can contain arbitrary injected code that gets sent back directly to the browser.
2012-05-15Ignore etags when displaying HTML pagesFlorian Pritz1-1/+3
This allows the html page to change (user logged in/not logged in), but still keeps etag support for content that's really going to stay the same (images, plain file content, qr codes for urls) Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-12Hide notice when getting key from memcacheFlorian Pritz1-1/+9
This looks horrible, but gets the job done... Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-12fix missing object initialization and properly declare class variablesFlorian Pritz3-3/+11
var is deprecated since ages and in strict mode we have to initialize $this->var as a generic object before using it. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-10Prevent browsers from deleting filesFlorian Pritz1-0/+5
CLI clients are expected to only request deletion when the users wants it. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-10Replace timeout (delete) link with info linkFlorian Pritz1-1/+2
The delete link won't ask for confirmation anymore, so don't use it. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-07Added a return false if an image doesn't pass XSS cleaning to prevent ↵Wes Baker1-0/+4
file_get_contents from returning a NULL and passing through unscathed.
2012-05-05Rework file deletion; allow to delete multiple IDs at onceFlorian Pritz6-82/+119
This removes the old form which was used to delete a single upload and replaces it with checkboxes on the history page. All checked IDs will be removed at once, instead of requiring the user to click through multiple pages. The old file/delete page is kept for compatibility with CLI clients. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-03user/hash_password: add form to support normal browsersFlorian Pritz2-2/+42
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-03document ID/info modeFlorian Pritz2-4/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-03remove password column from `files`Florian Pritz2-1/+22
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-03add ID/info to display more information about a fileFlorian Pritz3-21/+45
The table is shared with the old delete_form, but it doesn't display the delete button in info mode. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-01use function to generate links to css filesFlorian Pritz4-4/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-01move file link generation from controller to viewFlorian Pritz2-12/+7
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-05-01move etag handling into handle_etag()Florian Pritz1-27/+23
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-04-23Merge pull request #1274 from Repox/2.1-stablePhil Sturgeon1-1/+1
Corrected the migration_missing_down_method language string
2012-04-23Corrected the migration_missing_down_method language stringRepox1-1/+1
2012-04-21Disable cache for upload_history for now.Florian Pritz1-1/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>