AgeCommit message (Collapse)AuthorLines
Merge branch 'rt/plain-binary'Lars Hjemli-2/+11
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-blob: return 'application/octet-stream' for binary blobsLars Hjemli-1/+7
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-plain: Return 'application/octet-stream' for binary files.Remko Tronçon-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 Hjemli-3/+18
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
use cgit_httpscheme() for atom feedDiego Ongaro-3/+6
add cgit_httpscheme() -> http:// or https://Diego Ongaro-0/+12
Return http statuscode 404 on unknown branchLars Hjemli-0/+6
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-1/+1
CGIT 0.8.2.1v0.8.2.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Fix doc-related glitches in Makefile and .gitignoreLars Hjemli-1/+6
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-11/+25
Merge branch 'asciidoc'Lars Hjemli-58/+78
ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli-6/+17
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
fix segfault when displaying empty blobsEric Wong-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>
ui-tree: escape ascii-text properly in hexdump viewLars Hjemli-4/+9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Makefile: add doc-related targetsLars Hjemli-2/+17
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Add cgit-doc.cssLars Hjemli-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 Hjemli-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 Hjemli-0/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
cgitrc.5.txt: make the cgitrc options a valid asciidoc labeled listLars Hjemli-51/+51
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
make cgitrc.5.txt asciidoc manpage compatibleMatt McCormick (thewtex)-4/+4
According to the instructions and requirements here: http://www.methods.co.nz/asciidoc/chunked/ar01s20.html
CGIT 0.8.2v0.8.2Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Use GIT-1.6.1.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/binary'Lars Hjemli-30/+119
shared.c: avoid SEGFAULT when checking for binary buffersLars Hjemli-2/+2
Before calling buffer_is_binary() we need to verify that the buffer is valid. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/header'Lars Hjemli-0/+9
ui-tree: show hexdump of binary blobsLars Hjemli-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 Hjemli-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 'stable'Lars Hjemli-2/+4
html.c: use correct escaping in html attributesLars Hjemli-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>
Add support for a custom headerLars Hjemli-0/+9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-1/+1
Merge branch 'jw/commit-decorations'Lars Hjemli-1/+12
Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
tests/t0105-commit.sh: expect commit decorationsLars Hjemli-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 Hjemli-0/+5
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Add decorations to commit pagesJustin Waters-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>
CGIT 0.8.1.1v0.8.1.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'og/tree-view-selection'Lars Hjemli-28/+34
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/stats'Lars Hjemli-4/+569
Conflicts: cgit.c cgit.css cgit.h ui-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-8/+11
Makefile: install cgit.{css,png} in CGIT_DATA_PATHTodd Zullinger-4/+6
CGIT_DATA_PATH defaults to CGIT_SCRIPT_PATH, but allows users to install the cgi and the data files in different locations. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Makefile: add INSTALL var to set install commandTodd Zullinger-4/+5
This also explicitly sets the modes for installed files (755 for the .cgi, 644 for the .css and .png). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Fix tar.bz2 snapshot exampleTodd Zullinger-2/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-2/+6
Avoid SEGFAULT on invalid requestsLars Hjemli-2/+6
When an unknown page is requested, either on the querystring or via PATH_INFO, we end up with a null-referencing cgit_cmd. This null- pointer is then used as argument to the hc() function (which decides what tab to render as 'active'), but this function failed to check if a valid cmd was specified and a SEGFAULT would occur. This patch fixes the issue by introducing a 'fallback-cmd' which specifies what tab to render as 'active' when no valid cmd is requested. While at it, we now also keep track of the active repository even if an invalid cmd was requested since we want to show the error message about the invalid request in the correct context. Noticed-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Make all tags viewableRobin Redeker-2/+11
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-2/+3
ui-tag: escape tagnames properlyLars Hjemli-2/+3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Change toggle to more meaningful termJustin Waters-1/+2
In the log interface, there is a toggle link at the top, but it isn't clear what's being toggled. I've changed it to "Expand" and "Collapse" to make it clear that you are getting more and less information, respectively. Signed-off-by: Justin Waters <justin.waters@timesys.com>
Merge branch 'snapshot-fixes'Lars Hjemli-13/+15