aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'lh/mimetypes'Gravatar Lars Hjemli2009-08-09-5/+45
|\
| * Add support for mime type registration and lookupGravatar Lars Hjemli2009-07-25-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to register mappings from filename extension to mime type in cgitrc and use this mapping when returning blob content in `plain` view. The reason for adding this mapping to cgitrc (as opposed to parsing something like /etc/mime.types) is to allow quick lookup of a limited number of filename extensions (/etc/mime-types on my machine currently contains over 700 entries). NB: A nice addition to this patch would be to parse /etc/mime.types when `plain` view is requested for a file with an extension for which there is no mapping registered in cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Expose file extension in tree lists as class to allow nicer tree stylingGravatar Martin Szulecki2009-08-08-1/+7
| | | | | | | | Signed-off-by: Martin Szulecki <opensuse@sukimashita.com>
* | Introduce noplainemail option to hide email adresses from spambotsGravatar Martin Szulecki2009-08-08-7/+22
|/ | | | Signed-off-by: Martin Szulecki <opensuse@sukimashita.com>
* Merge branch 'lh/embedded'Gravatar Lars Hjemli2009-07-25-6/+37
|\ | | | | | | | | | | Conflicts: cgitrc.5.txt ui-shared.c
| * cgit.h: keep config flags sortedGravatar Lars Hjemli2009-07-25-2/+2
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * cgitrc.5.txt: document 'embedded' and 'noheader'Gravatar Lars Hjemli2009-07-25-0/+9
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * Add support for 'noheader' optionGravatar Lars Hjemli2009-07-25-7/+16
| | | | | | | | | | | | | | | | This option can be used to disable the standard cgit page header, which might be useful in combination with the 'embedded' option. Suggested-by: Mark Constable <markc@renta.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * Add support for an 'embedded' option in cgitrcGravatar Lars Hjemli2009-02-02-0/+13
| | | | | | | | | | | | | | | | | | | | When activated, cgit will neither generate http headers nor any 'framing' html elements (like <html> and <body>). Also, all page content is now wrapped in a <div id='cgit'> element to make it easier to select the correct cgit classes when embedded/themed. Suggested-by: Matt Sealey <matt@genesi-usa.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'ml/head-include'Gravatar Lars Hjemli2009-07-25-1/+10
|\ \
| * | cgitrc.5.txt: document 'head-include'Gravatar Lars Hjemli2009-07-25-0/+4
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add head-include configuration option.Gravatar Mark Lodato2009-06-08-1/+6
| | | | | | | | | | | | | | | | | | This patch adds an option to the configuration file, "head-include", which works just like "header" or "footer", except the content is put into the HTML's <head> tag.
* | | Merge branch 'plain-etag'Gravatar Lars Hjemli2009-07-25-0/+12
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ui-shared.c
| * | | Add support for HEAD requestsGravatar Lars Hjemli2009-02-20-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is a quick 'n dirty hack which makes cgit honor HEAD requests. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add support for ETag in 'plain' viewGravatar Lars Hjemli2009-02-20-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When downloading a blob identified by its path, the client might want to know if the blob has been modified since a previous download of the same path. To this end, an ETag containing the blob SHA1 seems to be ideal. Todo: add support for HEAD requests... Suggested-by: Owen Taylor <otaylor@redhat.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'rt/plain-binary'Gravatar Lars Hjemli2009-07-25-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | ui-blob: return 'application/octet-stream' for binary blobsGravatar Lars Hjemli2009-07-25-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | ui-plain: Return 'application/octet-stream' for binary files.Gravatar Remko Tronçon2009-07-25-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Remko Tronçon <git@el-tramo.be> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'do/https'Gravatar Lars Hjemli2009-07-25-3/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | | use cgit_httpscheme() for atom feedGravatar Diego Ongaro2009-06-11-3/+6
| | | | | |
| * | | | | add cgit_httpscheme() -> http:// or https://Gravatar Diego Ongaro2009-06-11-0/+12
| | |_|/ / | |/| | |
* | | | | Return http statuscode 404 on unknown branchGravatar Lars Hjemli2009-06-08-0/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2009-03-15-1/+1
|\ \ \ \ | |/ / /
| * | | CGIT 0.8.2.1Gravatar Lars Hjemli2009-03-15-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Fix doc-related glitches in Makefile and .gitignoreGravatar Lars Hjemli2009-03-15-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2009-03-15-11/+25
|\ \ \ \ | |/ / /
| * | | ui-snapshot: avoid segfault when no filename is specifiedGravatar Lars Hjemli2009-03-15-6/+17
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | fix segfault when displaying empty blobsGravatar Eric Wong2009-03-15-5/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | When size is zero, subtracting one from it turns it into ULONG_MAX which causes an out-of-bounds access on buf. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'asciidoc'Gravatar Lars Hjemli2009-03-15-58/+78
|\ \ \ | |/ / |/| |
| * | Makefile: add doc-related targetsGravatar Lars Hjemli2009-02-12-2/+17
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add cgit-doc.cssGravatar Lars Hjemli2009-02-12-0/+3
| | | | | | | | | | | | | | | | | | | | | This css is used to tweak the display of asciidoc-generated html for cgitrc.5.txt. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: un-indent the name sectionGravatar Lars Hjemli2009-02-12-1/+1
| | | | | | | | | | | | | | | | | | Otherwise, this section is treated as a preformatted, literal block. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: wrap the example file in an asciidoc LiteralBlockGravatar Lars Hjemli2009-02-12-0/+2
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: make the cgitrc options a valid asciidoc labeled listGravatar Lars Hjemli2009-02-12-51/+51
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | make cgitrc.5.txt asciidoc manpage compatibleGravatar Matt McCormick (thewtex)2009-02-12-4/+4
| |/ | | | | | | | | According to the instructions and requirements here: http://www.methods.co.nz/asciidoc/chunked/ar01s20.html
* | ui-tree: escape ascii-text properly in hexdump viewGravatar Lars Hjemli2009-02-12-4/+9
|/ | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* CGIT 0.8.2Gravatar Lars Hjemli2009-02-02-1/+1
| | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Use GIT-1.6.1.1Gravatar Lars Hjemli2009-02-02-1/+1
| | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Merge branch 'lh/binary'Gravatar Lars Hjemli2009-02-02-30/+119
|\
| * shared.c: avoid SEGFAULT when checking for binary buffersGravatar Lars Hjemli2009-02-02-2/+2
| | | | | | | | | | | | | | Before calling buffer_is_binary() we need to verify that the buffer is valid. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-tree: show hexdump of binary blobsGravatar Lars Hjemli2009-02-01-23/+67
| | | | | | | | | | | | | | This teaches ui-tree to detect binary blobs and display them similar to `hexdump -C` (only wider). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * Handle binary files in diffsGravatar Lars Hjemli2009-01-31-7/+52
| | | | | | | | | | | | | | This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch) how to handle binary files. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'lh/header'Gravatar Lars Hjemli2009-02-02-0/+9
|\ \ | |/ |/|
| * Add support for a custom headerGravatar Lars Hjemli2009-01-30-0/+9
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2009-01-30-2/+4
|\ \ | |/ |/|
| * html.c: use correct escaping in html attributesGravatar Lars Hjemli2009-01-30-2/+4
| | | | | | | | | | | | | | First, an apostrophe is not a quote. Second, we also need to escape quotes. And finally, quotes are encoded as '&quot;', not '&quote;'. Sighned-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2009-01-28-1/+1
|\ \ | |/
| * CGIT 0.8.1.1Gravatar Lars Hjemli2009-01-28-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'jw/commit-decorations'Gravatar Lars Hjemli2009-01-28-1/+12
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | tests/t0105-commit.sh: expect commit decorationsGravatar Lars Hjemli2009-01-28-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When a commit is referenced by a branch or tag the commit subject- line will be suffixed with the proper decorations, hence the test for this line needs to be updated. Signed-off-by: Lars Hjemli <hjemli@gmail.com>