summaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeLines
* Merge branch 'lh/embedded'Lars Hjemli2009-07-25-6/+37
|\ | | | | | | | | | | Conflicts: cgitrc.5.txt ui-shared.c
| * cgit.h: keep config flags sortedLars Hjemli2009-07-25-2/+2
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * cgitrc.5.txt: document 'embedded' and 'noheader'Lars Hjemli2009-07-25-0/+9
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * Add support for 'noheader' optionLars 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 cgitrcLars 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'Lars Hjemli2009-07-25-1/+10
|\ \
| * | cgitrc.5.txt: document 'head-include'Lars Hjemli2009-07-25-0/+4
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add head-include configuration option.Mark Lodato2009-06-07-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'Lars Hjemli2009-07-25-0/+12
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ui-shared.c
| * | | Add support for HEAD requestsLars Hjemli2009-02-19-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' viewLars Hjemli2009-02-19-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'Lars Hjemli2009-07-25-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | ui-blob: return 'application/octet-stream' for binary blobsLars Hjemli2009-07-25-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | ui-plain: Return 'application/octet-stream' for binary files.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'Lars Hjemli2009-07-25-3/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | | use cgit_httpscheme() for atom feedDiego Ongaro2009-06-11-3/+6
| | | | | |
| * | | | | add cgit_httpscheme() -> http:// or https://Diego Ongaro2009-06-11-0/+12
| | |_|/ / | |/| | |
* / | | | Return http statuscode 404 on unknown branchLars Hjemli2009-06-07-0/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Lars Hjemli2009-03-15-1/+1
|\| | |
| * | | CGIT 0.8.2.1Lars Hjemli2009-03-15-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Fix doc-related glitches in Makefile and .gitignoreLars Hjemli2009-03-15-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Lars Hjemli2009-03-15-11/+25
|\| | |
| * | | ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli2009-03-15-6/+17
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | fix segfault when displaying empty blobsEric 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'Lars Hjemli2009-03-15-58/+78
|\ \ \ | |/ / |/| |
| * | Makefile: add doc-related targetsLars Hjemli2009-02-12-2/+17
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add cgit-doc.cssLars 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 sectionLars 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 LiteralBlockLars Hjemli2009-02-12-0/+2
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: make the cgitrc options a valid asciidoc labeled listLars Hjemli2009-02-12-51/+51
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | make cgitrc.5.txt asciidoc manpage compatibleMatt 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 viewLars Hjemli2009-02-12-4/+9
|/ | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* CGIT 0.8.2Lars Hjemli2009-02-01-1/+1
| | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Use GIT-1.6.1.1Lars Hjemli2009-02-01-1/+1
| | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Merge branch 'lh/binary'Lars Hjemli2009-02-01-30/+119
|\
| * shared.c: avoid SEGFAULT when checking for binary buffersLars Hjemli2009-02-01-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 blobsLars Hjemli2009-01-31-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 diffsLars 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'Lars Hjemli2009-02-01-0/+9
|\ \ | |/ |/|
| * Add support for a custom headerLars Hjemli2009-01-29-0/+9
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2009-01-29-2/+4
|\ \ | |/ |/|
| * html.c: use correct escaping in html attributesLars Hjemli2009-01-29-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'Lars Hjemli2009-01-27-1/+1
|\|
| * CGIT 0.8.1.1Lars Hjemli2009-01-27-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'jw/commit-decorations'Lars Hjemli2009-01-27-1/+12
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | tests/t0105-commit.sh: expect commit decorationsLars Hjemli2009-01-27-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>
| * | cgit.css: minor adjustment of commit decorationsLars Hjemli2009-01-27-0/+5
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add decorations to commit pagesJustin Waters2009-01-27-0/+5
| | | | | | | | | | | | | | | | | | | | | This adds the tag and branch head decorations to the commit pages. This is similar to how commits are displayed in the standard gitweb interface. Signed-off-by: Justin Waters <justin.waters@timesys.com>
* | | Merge branch 'og/tree-view-selection'Lars Hjemli2009-01-27-28/+34
|\ \ \ | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | changed objects are outputted, allowing for selections of code onlyOnne Gorter2009-01-10-28/+34
| | | |