| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
This creates a merge base for later merges.
Conflicts:
application/.htaccess
application/cache/.htaccess
application/cache/index.html
application/config/index.html
application/controllers/index.html
application/core/index.html
application/errors/error_404.php
application/errors/error_db.php
application/errors/error_general.php
application/errors/error_php.php
application/errors/index.html
application/helpers/index.html
application/hooks/index.html
application/index.html
application/language/english/index.html
application/libraries/index.html
application/logs/index.html
application/models/index.html
application/third_party/index.html
application/views/index.html
index.php
license.txt
system/.htaccess
system/core/Benchmark.php
system/core/CodeIgniter.php
system/core/Common.php
system/core/Config.php
system/core/Controller.php
system/core/Exceptions.php
system/core/Hooks.php
system/core/Input.php
system/core/Lang.php
system/core/Loader.php
system/core/Model.php
system/core/Output.php
system/core/Router.php
system/core/Security.php
system/core/URI.php
system/core/Utf8.php
system/core/index.html
system/database/DB.php
system/database/DB_active_rec.php
system/database/DB_cache.php
system/database/DB_driver.php
system/database/DB_forge.php
system/database/DB_result.php
system/database/DB_utility.php
system/database/drivers/index.html
system/database/drivers/mssql/index.html
system/database/drivers/mssql/mssql_driver.php
system/database/drivers/mssql/mssql_forge.php
system/database/drivers/mssql/mssql_result.php
system/database/drivers/mssql/mssql_utility.php
system/database/drivers/mysql/index.html
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysql/mysql_forge.php
system/database/drivers/mysql/mysql_result.php
system/database/drivers/mysql/mysql_utility.php
system/database/drivers/mysqli/index.html
system/database/drivers/mysqli/mysqli_driver.php
system/database/drivers/mysqli/mysqli_forge.php
system/database/drivers/mysqli/mysqli_result.php
system/database/drivers/mysqli/mysqli_utility.php
system/database/drivers/oci8/index.html
system/database/drivers/oci8/oci8_driver.php
system/database/drivers/oci8/oci8_forge.php
system/database/drivers/oci8/oci8_result.php
system/database/drivers/oci8/oci8_utility.php
system/database/drivers/odbc/index.html
system/database/drivers/odbc/odbc_driver.php
system/database/drivers/odbc/odbc_forge.php
system/database/drivers/odbc/odbc_result.php
system/database/drivers/odbc/odbc_utility.php
system/database/drivers/postgre/index.html
system/database/drivers/postgre/postgre_driver.php
system/database/drivers/postgre/postgre_forge.php
system/database/drivers/postgre/postgre_result.php
system/database/drivers/postgre/postgre_utility.php
system/database/drivers/sqlite/index.html
system/database/drivers/sqlite/sqlite_driver.php
system/database/drivers/sqlite/sqlite_forge.php
system/database/drivers/sqlite/sqlite_result.php
system/database/drivers/sqlite/sqlite_utility.php
system/database/index.html
system/fonts/index.html
system/fonts/texb.ttf
system/helpers/array_helper.php
system/helpers/captcha_helper.php
system/helpers/cookie_helper.php
system/helpers/date_helper.php
system/helpers/directory_helper.php
system/helpers/download_helper.php
system/helpers/email_helper.php
system/helpers/file_helper.php
system/helpers/form_helper.php
system/helpers/html_helper.php
system/helpers/index.html
system/helpers/inflector_helper.php
system/helpers/language_helper.php
system/helpers/number_helper.php
system/helpers/path_helper.php
system/helpers/security_helper.php
system/helpers/smiley_helper.php
system/helpers/string_helper.php
system/helpers/text_helper.php
system/helpers/typography_helper.php
system/helpers/url_helper.php
system/helpers/xml_helper.php
system/index.html
system/language/english/calendar_lang.php
system/language/english/date_lang.php
system/language/english/db_lang.php
system/language/english/email_lang.php
system/language/english/form_validation_lang.php
system/language/english/ftp_lang.php
system/language/english/imglib_lang.php
system/language/english/index.html
system/language/english/number_lang.php
system/language/english/profiler_lang.php
system/language/english/unit_test_lang.php
system/language/english/upload_lang.php
system/language/index.html
system/libraries/Cache/Cache.php
system/libraries/Cache/drivers/Cache_apc.php
system/libraries/Cache/drivers/Cache_dummy.php
system/libraries/Cache/drivers/Cache_file.php
system/libraries/Cache/drivers/Cache_memcached.php
system/libraries/Calendar.php
system/libraries/Cart.php
system/libraries/Driver.php
system/libraries/Email.php
system/libraries/Encrypt.php
system/libraries/Form_validation.php
system/libraries/Ftp.php
system/libraries/Image_lib.php
system/libraries/Javascript.php
system/libraries/Log.php
system/libraries/Pagination.php
system/libraries/Parser.php
system/libraries/Profiler.php
system/libraries/Session.php
system/libraries/Sha1.php
system/libraries/Table.php
system/libraries/Trackback.php
system/libraries/Typography.php
system/libraries/Unit_test.php
system/libraries/Upload.php
system/libraries/User_agent.php
system/libraries/Xmlrpc.php
system/libraries/Xmlrpcs.php
system/libraries/Zip.php
system/libraries/index.html
system/libraries/javascript/Jquery.php
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
|
|
stop environment checks.
|
|
stop environment checks.
|
|
|
|
available.
|
|
|
|
|
|
|
|
Reactor: FALSE.
|
|
Reactor: FALSE.
|
|
|
|
available but no method. Fixes #19
|
|
Signed-off-by: Florian Pritz <bluewind@server-speed.net>
|
|
Unicode Consortium's trademark.
|
|
|
|
|
|
|
|
|
|
the old Base5.
If a constructor is needed in a controller, call parent::__contruct()
|
|
|
|
segments.
|
|
|
|
Suhosin's function blacklist. Simply moved the set_time_limit call down a bit.
|
|
|
|
to a fatal PHP error.
|
|
|
|
|
|
|
|
|
