aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2009-03-15Merge branch 'stable'Lars Hjemli2-11/+25
2009-03-15Merge branch 'asciidoc'Lars Hjemli3-58/+78
2009-03-15ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli1-6/+17
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-03-15fix segfault when displaying empty blobsEric Wong1-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>
2009-02-12ui-tree: escape ascii-text properly in hexdump viewLars Hjemli1-4/+9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-12Makefile: add doc-related targetsLars Hjemli1-2/+17
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-12Add cgit-doc.cssLars Hjemli1-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>
2009-02-12cgitrc.5.txt: un-indent the name sectionLars Hjemli1-1/+1
Otherwise, this section is treated as a preformatted, literal block. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-12cgitrc.5.txt: wrap the example file in an asciidoc LiteralBlockLars Hjemli1-0/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-12cgitrc.5.txt: make the cgitrc options a valid asciidoc labeled listLars Hjemli1-51/+51
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-12make cgitrc.5.txt asciidoc manpage compatibleMatt McCormick (thewtex)1-4/+4
According to the instructions and requirements here: http://www.methods.co.nz/asciidoc/chunked/ar01s20.html
2009-02-01CGIT 0.8.2v0.8.2Lars Hjemli1-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01Use GIT-1.6.1.1Lars Hjemli2-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01Merge branch 'lh/binary'Lars Hjemli7-30/+119
2009-02-01shared.c: avoid SEGFAULT when checking for binary buffersLars Hjemli1-2/+2
Before calling buffer_is_binary() we need to verify that the buffer is valid. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01Merge branch 'lh/header'Lars Hjemli4-0/+9
2009-01-31ui-tree: show hexdump of binary blobsLars Hjemli2-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>
2009-01-31Handle binary files in diffsLars Hjemli5-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>
2009-01-29Merge branch 'stable'Lars Hjemli1-2/+4
2009-01-29html.c: use correct escaping in html attributesLars Hjemli1-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>
2009-01-29Add support for a custom headerLars Hjemli4-0/+9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27Merge branch 'stable'Lars Hjemli1-1/+1
2009-01-27Merge branch 'jw/commit-decorations'Lars Hjemli4-1/+12
Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27tests/t0105-commit.sh: expect commit decorationsLars Hjemli1-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>
2009-01-27cgit.css: minor adjustment of commit decorationsLars Hjemli1-0/+5
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27Add decorations to commit pagesJustin Waters2-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>
2009-01-27CGIT 0.8.1.1v0.8.1.1Lars Hjemli1-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27Merge branch 'og/tree-view-selection'Lars Hjemli3-28/+34
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27Merge branch 'lh/stats'Lars Hjemli12-4/+569
Conflicts: cgit.c cgit.css cgit.h ui-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12Merge branch 'stable'Lars Hjemli2-8/+11
2009-01-12Makefile: install cgit.{css,png} in CGIT_DATA_PATHTodd Zullinger1-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>
2009-01-12Makefile: add INSTALL var to set install commandTodd Zullinger1-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>
2009-01-12Fix tar.bz2 snapshot exampleTodd Zullinger1-2/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-11Merge branch 'stable'Lars Hjemli2-2/+6
2009-01-11Avoid SEGFAULT on invalid requestsLars Hjemli2-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>
2009-01-11Make all tags viewableRobin Redeker2-2/+11
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-11Merge branch 'stable'Lars Hjemli1-2/+3
2009-01-11ui-tag: escape tagnames properlyLars Hjemli1-2/+3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-11Change toggle to more meaningful termJustin Waters1-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>
2009-01-11Merge branch 'snapshot-fixes'Lars Hjemli2-13/+15
2009-01-11Merge branch 'lh/mimetypes'Lars Hjemli2-3/+3
2009-01-11Merge branch 'lh/virtual-root'Lars Hjemli1-20/+21
2009-01-11Merge branch 'stable'Lars Hjemli1-2/+2
2009-01-11ui-log: show name-decorations in log outputLars Hjemli2-0/+59
Commits are now decorated with a clickable 'label' for each ref pointing at it, similar to how gitweb and gitk displays commit decorations. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-10Makefile: avoid libcurl when building gitLars Hjemli1-2/+2
We don't need support for fetching/pushing in libgit.a, hence we don't need to link with libcurl. Noticed-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-10ui-refs: avoid SEGFAULT on lightweight tagsRobin Redeker1-1/+1
Signed-off-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-10changed objects are outputted, allowing for selections of code onlyOnne Gorter3-28/+34
2009-01-06Merge branch 'stable'Lars Hjemli2-3/+5
2009-01-06ui-tree.c: do not add blank line when displaying blobsLars Hjemli2-3/+5
Also, fix a related bug in the test-suite. Noticed-by: Jim Meyering <jim@meyering.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-30Merge branch 'stable'Lars Hjemli1-2/+2