Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
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>
|
|
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>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
mime2extension tells us if the file is text that can be highlit.
filename2extension leeds to unwanted behaviour if the filename is
for example "PKGBUILD", but the file is a binary.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
do_paste has been remove in b8fb38927fd2cc25f6748cff51b7de94e3082701
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
We shouldn't mess with that when it's already set in php.ini.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
|
|
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>
|
|
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@xinu.at>
|
|
|
|
in the change log
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
This allows me to remove redundant variable definition from
upload_form() since the same code is in client().
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
Signed-off-by: Florian Pritz <bluewind@xinu.at>
|
|
up the docs?
|
|
|
|
|
|
|
|
"taxs" and it was tough to code in new rules.
|
|
|
|
|
|
fields. All other drivers were correct.
|
|
|
|
|
|
|
|
between it and the opening tag.
|
|
|
|
item in cart
|
|
|
|
Pointless, but was adding...
|
|
|
|
another massive whitespace 'cleanup' commit
|