summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-16add css for rendered markdownFlorian Pritz1-0/+73
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-01check if file exists before getting mtimeFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-01add mtime to url for default.cssFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-30add expire header for css files and append mtime to urlFlorian Pritz3-2/+11
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-30highlight complete line; not only line numberFlorian Pritz2-0/+38
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-15valid_id: bail early if we can't get the file dataFlorian Pritz1-0/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-15remove unneeded call to filename2extensionFlorian Pritz1-1/+0
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>
2011-09-15remove leftover codeFlorian Pritz1-2/+0
do_paste has been remove in b8fb38927fd2cc25f6748cff51b7de94e3082701 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-13fix undefined variables in upload_form when using a cli clientFlorian Pritz1-4/+11
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-11properly initialize $lengths arrayFlorian Pritz1-5/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-11add upload_history to front pageFlorian Pritz1-2/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-11add upload_history pageFlorian Pritz5-0/+185
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-11use system wide error_reporting valueFlorian Pritz1-2/+2
We shouldn't mess with that when it's already set in php.ini. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-08fix markdown.pl pathFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-21mimetype: use magicFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-21Merge branch 'working'Florian Pritz61-628/+2100
2011-08-21Merge commit 'v2.0.3' into workingFlorian Pritz59-634/+2096
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>
2011-08-21Merge commit '1224f191d48d6dce920138a82e142134cc0b5231' into workingFlorian Pritz4-4/+10
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>
2011-08-21add htaccess filesFlorian Pritz3-0/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-20Merge branch 'release/v2.0.3'Derek Jones142-348/+387
2011-08-20updated version number in user guide, removed some stray merge markers found ↵Derek Jones130-137/+131
in the change log
2011-08-19hide "Latest release" on client page if there is noneFlorian Pritz2-2/+4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-19move inclusion of file_plaintext/client view to controllerFlorian Pritz2-4/+3
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>
2011-08-19remove old upload snippetsFlorian Pritz1-4/+0
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-19make "contact me" on the main page optionalFlorian Pritz3-2/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-19fix warning if data/client/latest doen't existFlorian Pritz1-1/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-15rewrite scripts/mimetype to support ascii with color codesFlorian Pritz2-476/+33
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-15export sane $PATHFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-08-13Bumped the version number. Can somebody with a working find and replace fix ↵Phil Sturgeon1-1/+1
up the docs?
2011-08-13Fixed conflicts in changelog.Phil Sturgeon2-2/+8
2011-08-13Fixed conflicts.Phil Sturgeon2-1/+3
2011-08-13Fixed conflicts.Phil Sturgeon3-2/+3
2011-08-13Improved logic for plural() and singular() as words like "tax" would become ↵Phil Sturgeon1-48/+67
"taxs" and it was tough to code in new rules.
2011-08-13Fixed conflict in changelog.Phil Sturgeon2-1/+3
2011-08-13Merge changelog.Adam Jackett1-0/+2
2011-08-13Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵Adam Jackett2-4/+12
fields. All other drivers were correct.
2011-08-13Added having() fix to changelog.Adam Jackett1-0/+1
2011-08-13Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-08-13Added note for fixed issue #199 in changelog.Phil Sturgeon1-1/+2
2011-08-13Fixed issue #199 - Attributes passed as string does not include a space ↵Eric Barnes1-0/+4
between it and the opening tag.
2011-08-13Fixed conflict in changelog.Phil Sturgeon3-0/+23
2011-08-13sync total items count and total amount price; by sum of quantity of each ↵MarcosCoelho1-1/+3
item in cart
2011-08-13Fixed conflicted changelog.Phil Sturgeon3-2/+24
2011-08-13Was working on this file so PHP5ified the method visibility scopes. ↵Phil Sturgeon1-154/+106
Pointless, but was adding...
2011-07-15added .gitignore, removed .hg filesDerek Jones3-15/+9
2011-07-03reverted texb.ttf font which had been compromised in 982b43c3590a by a ↵Derek Jones1-0/+0
another massive whitespace 'cleanup' commit
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones229-2046/+2045
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones230-2110/+2110
broke the Typography class's string replacements, for instance
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-01 02:54:26 +0100