summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2014-08-30Merge tag '2.2.0' into workingFlorian Pritz2-8/+9
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-17Fix comptability with php 5.6Florian Pritz1-1/+2
References: http://ellislab.com/forums/viewthread/244510/#1066558 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-06-06Merge remote-tracking branch 'remotes/upstream/2.2-stable' into workingFlorian Pritz118-328/+295
Signed-off-by: Florian Pritz <bluewind@xinu.at> Conflicts: system/libraries/Session.php user_guide/
2014-06-06Update CI_VERSIONAndrey Andreev1-1/+1
2014-06-06Issue #3084Andrey Andreev1-5/+2
2014-06-05Minor style fixes to improve readability in HMAC authenticationQuinn Chrzan1-3/+7
2014-05-31Backport HMAC authentication for CI_SessionAndrey Andreev1-22/+34
2014-05-31Changelog messages, bump year in copyright noticesAndrey Andreev115-212/+195
2014-05-29Removing xor_encode from Encrypt libraryQuinn Chrzan1-62/+15
2014-05-13Fix timing attack on session hashFlorian Pritz1-1/+8
http://seclists.org/fulldisclosure/2014/May/54 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-02-27Deleted useless .htaccess file, added missed index.html files.Ender Teszla3-0/+30
2014-01-07Manually apply an improved version of PR #2427Andrey Andreev1-6/+5
2013-12-11Make oci_execute() calls inside num_rows() non-committing. Fixes #696.Aaron Krebs1-2/+2
Fixes bug in Oracle driver. Calls to oci_execute() inside num_rows() of the Oracle driver can be made non-committing to fix bug with transactions. Since calls to oci_execute are only there to reset which row is next in line for oci_fetch() calls, it's fine to not commit.
2013-12-05Fix some spacing issues from PR #2689Andrey Andreev1-9/+4
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-6/+2
This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447.
2013-10-18Bugfix on the active record join statement with empty conditionsblowdoof1-2/+6
2013-10-18Bugfix on the sqlsrv forge driver rename_table functionblowdoof1-5/+3
2013-10-18Bugfix on the sqlsrv forge driver create_table functionblowdoof1-11/+9
2013-10-18removed unnecessary assignmentblowdoof1-1/+0
2013-10-18Style correctionblowdoof1-6/+6
2013-10-18Fix on sqlsrv_forge drop_tabletino1-1/+8
2013-10-18Bugfix on truncate commandtino1-1/+1
2013-09-22Merge tag '2.1.4'Florian Pritz5-11/+10
Signed-off-by: Florian Pritz <bluewind@xinu.at> Conflicts: application/config/migration.php user_guide/changelog.html
2013-09-16Remove executable bitsFlorian Pritz130-0/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-02Allow to override config_item() options; add modification commentsFlorian Pritz2-1/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-09-02remove left over security libraryFlorian Pritz1-737/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-08-05Suhosin compatible emailsPlamenVasilev1-4/+4
Fix problems with Suhosin and sending emails trough php mail()
2013-07-08Revert "Updating User Guide for 2.1.4."Wes Baker1-1/+1
This reverts commit c5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b. Signed-off-by: Wes Baker <wes@wesbaker.com>
2013-07-08Updating User Guide for 2.1.4.Wes Baker2-2/+2
2013-07-05Added small improvement to the _remove_evil_attributes functionbrian9781-7/+6
Signed-off-by: brian978 <dbrian89@yahoo.com> Signed-off-by: Wes Baker <wes@wesbaker.com> Conflicts: system/core/Security.php
2013-03-15Email library: htmlspecialchars for _header_strmoi901-1/+1
2012-11-05Error on line 1407 of db_active_rec.php traces to mis-named variablesPatrick Zeinert1-1/+1
Corrected variables to $k2 and $v2
2012-10-28Fix language typo in Migrations libraryMichael Brooks1-1/+1
lang and line were out of order
2012-10-08Merge tag '2.1.3'Florian Pritz11-117/+106
Conflicts: user_guide Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-10-08Really fix #1715Andrey Andreev1-1/+1
2012-10-08Fix issue #1715Andrey Andreev1-4/+4
2012-10-07Bump version number to 2.1.3Andrey Andreev2-3/+3
2012-10-06Backport security fixesAndrey Andreev1-26/+25
2012-10-06Fix issues #227 and #907Andrey Andreev1-32/+31
2012-10-04Backport fix for issue #1699Andrey Andreev1-21/+11
2012-09-05Backport a fix for oci8_result::num_rows()Andrey Andreev1-6/+4
2012-08-01Style fix and changelog entry for pull #1675Andrey Andreev1-1/+1
2012-07-31Fix warning by profiler when userdata has objectsRaul Baldner junior1-1/+1
If session data has objects and profiler is enabled, a warning is trown: > A PHP Error was encountered > Severity: Warning > Message: htmlspecialchars() expects parameter 1 to be string, object given > Filename: libraries/Profiler.php > Line Number: 514
2012-07-24Change is_loaded() to return a referenceAndrey Andreev1-1/+1
2012-07-18Backport fix for issue #1314Andrey Andreev1-2/+5
2012-07-09Alter CI_DB_pdo_result::num_rows()Andrey Andreev1-11/+12
2012-07-04Merge tag '2.1.2'Florian Pritz15-90/+101
Conflicts: system/database/DB_driver.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/doc_style/template.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_211.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-07-04Backport CI_Config::load() optimization from pull #1571Andrey Andreev1-6/+6
2012-07-02Fix issue #1543Andrey Andreev1-6/+5
2012-06-29Bumping version number to 2.1.2.Wes Baker5-5/+5
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-06-18 15:13:30 +0200