Commit Graph

1398 Commits

Author SHA1 Message Date
Lars Hjemli
0cbb50841a Add support for an 'embedded' option in cgitrc
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>
2009-02-02 08:11:29 +01:00
Lars Hjemli
8cc0287123 CGIT 0.8.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01 19:31:37 +01:00
Lars Hjemli
8cbbb64481 Use GIT-1.6.1.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01 19:30:16 +01:00
Lars Hjemli
5e447b1ed1 Merge branch 'lh/binary' 2009-02-01 19:29:47 +01:00
Lars Hjemli
481ce5e298 shared.c: avoid SEGFAULT when checking for binary buffers
Before calling buffer_is_binary() we need to verify that the buffer
is valid.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-01 19:29:24 +01:00
Lars Hjemli
0b3c746ba8 Merge branch 'lh/header' 2009-02-01 19:17:52 +01:00
Lars Hjemli
ae1d4d75b2 ui-tree: show hexdump of binary blobs
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-31 17:45:48 +01:00
Lars Hjemli
c495cf02ba Handle binary files in diffs
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-31 10:40:40 +01:00
Lars Hjemli
d6174b7aab Merge branch 'stable' 2009-01-29 22:21:24 +01:00
Lars Hjemli
7efcef00b5 html.c: use correct escaping in html attributes
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-29 22:21:15 +01:00
Lars Hjemli
b115955d71 Add support for a custom header
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-29 21:27:39 +01:00
Lars Hjemli
a61871a18f Merge branch 'stable' 2009-01-27 23:03:05 +01:00
Lars Hjemli
dfc4c82aad Merge branch 'jw/commit-decorations'
Conflicts:
	cgit.css

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 23:00:40 +01:00
Lars Hjemli
38fde35f9a tests/t0105-commit.sh: expect commit decorations
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-27 22:59:23 +01:00
Lars Hjemli
236665d70d cgit.css: minor adjustment of commit decorations
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 22:47:24 +01:00
Justin Waters
0027e38b40 Add decorations to commit pages
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-27 22:45:47 +01:00
Lars Hjemli
ba75f6613e CGIT 0.8.1.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 20:35:49 +01:00
Lars Hjemli
1fdde95a5a Merge branch 'og/tree-view-selection'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 20:21:56 +01:00
Lars Hjemli
7710178e45 Merge branch 'lh/stats'
Conflicts:
	cgit.c
	cgit.css
	cgit.h
	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 20:16:37 +01:00
Lars Hjemli
e78186dcb6 Merge branch 'stable' 2009-01-12 08:57:23 +01:00
Todd Zullinger
d529c6fbdc Makefile: install cgit.{css,png} in CGIT_DATA_PATH
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-12 08:56:54 +01:00
Todd Zullinger
4ac89ec8b4 Makefile: add INSTALL var to set install command
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-12 08:22:24 +01:00
Todd Zullinger
3796c2d8d2 Fix tar.bz2 snapshot example
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12 08:21:58 +01:00
Lars Hjemli
31665579c2 Merge branch 'stable' 2009-01-11 22:00:25 +01:00
Lars Hjemli
eb14609dc4 Avoid SEGFAULT on invalid requests
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-11 21:23:04 +01:00
Robin Redeker
372b4041bd Make all tags viewable
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-11 16:39:43 +01:00
Lars Hjemli
5176db2e2b Merge branch 'stable' 2009-01-11 16:38:19 +01:00
Lars Hjemli
720b6ece90 ui-tag: escape tagnames properly
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-11 16:37:47 +01:00
Justin Waters
1383fe3fa6 Change toggle to more meaningful term
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-11 12:52:38 +01:00
Lars Hjemli
aa60ae12cb Merge branch 'snapshot-fixes' 2009-01-11 12:22:46 +01:00
Lars Hjemli
7f7c1ddd37 Merge branch 'lh/mimetypes' 2009-01-11 12:22:31 +01:00
Lars Hjemli
ef688e16f0 Merge branch 'lh/virtual-root' 2009-01-11 12:22:19 +01:00
Lars Hjemli
d1c48e5139 Merge branch 'stable' 2009-01-11 12:18:25 +01:00
Lars Hjemli
ef2dc552b2 ui-log: show name-decorations in log output
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-11 12:16:18 +01:00
Lars Hjemli
c63aaff2ad Makefile: avoid libcurl when building git
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-10 15:18:18 +01:00
Robin Redeker
5164be3277 ui-refs: avoid SEGFAULT on lightweight tags
Signed-off-by: Robin Redeker <elmex@ta-sa.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-10 12:48:39 +01:00
Onne Gorter
a90e2aa4e1 changed objects are outputted, allowing for selections of code only 2009-01-10 12:13:54 +01:00
Lars Hjemli
25f6a1f4c2 Merge branch 'stable' 2009-01-06 21:51:09 +01:00
Lars Hjemli
f3c99cf1ce ui-tree.c: do not add blank line when displaying blobs
Also, fix a related bug in the test-suite.

Noticed-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-06 21:37:23 +01:00
Lars Hjemli
50fbd46c91 Merge branch 'stable' 2008-12-30 12:29:50 +01:00
Tomas Carnecky
03afc5fe1f ui-patch: whitespace changes in the patch generation code
Add a space between the committer name and email, and remove
superfluous spaces in the date header.

This makes cgit-generated patches match the output from git-format-patch
almost exactly, at least as far as the email headers go.

Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-30 11:16:25 +01:00
Lars Hjemli
7bbc274585 tests/t0107-snapshot.sh: make testscript match updated snapshot behavior
Since cgit now returns a 404 error when the snapshot filename cannot be
resolved to a commit object, the testscript needs to request a valid
snapshot name.

Also, the script assumed that the toplevel directory in the snapshot
would get the name of the repository but it's now named similar to
the requested snapshot.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-28 10:52:35 +01:00
Natanael Copa
c4b45de334 return 404 if snapshot is not found
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-28 10:09:18 +01:00
Lars Hjemli
ed77b2e0bf ui-snapshot.c: change mime-type for tar.gz and tar.bz2
The updated mime-types seems to work better than the old ones with both
safari and firefox.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-26 11:33:59 +01:00
Lars Hjemli
06de14d0fd Use GIT-1.6.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-26 11:03:01 +01:00
Lars Hjemli
0edf76078e shared.c: future-proof usage of git diff-structures
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-26 11:02:02 +01:00
Lars Hjemli
377a1c8ced Untie logic for SCRIPT_NAME and PATH_INFO
SCRIPT_NAME is used as fallback for virtual-root when virtual-root is
unspecified in cgitrc and PATH_INFO is used as fallback for the query-
string parameter 'url' when the latter is unspecified. But until now,
the use of PATH_INFO depended on virtual-root also being unspecified,
i.e. it was impossible to use PATH_INFO when virtual-root was specified.

This commit makes the fallback on SCRIPT_NAME and PATH_INFO independent
code paths, i.e. it is now possible to specify virtual-root in cgitrc
while still using PATH_INFO (instead of rewrite rules) to get 'pretty
urls'.

Noticed-by: Jack Moffitt <jack@chesspark.com>
Noticed-by: LiKai Liu <liulk@cs.bu.edu>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-26 10:33:01 +01:00
Lars Hjemli
b54ef9749c ui-stats.c: reuse cgit_add_hidden_formfields()
This makes sure that the currect branch and path is preserved when
changing the stats period or author count.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-07 15:57:55 +01:00
Lars Hjemli
c3c925f4ec ui-shared: externalize add_hidden_formfields()
This function will be reused by ui-stats.c in the next commit.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-07 15:52:35 +01:00
Lars Hjemli
837d464af7 ui-tree: add link to stats page per path
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-07 13:34:42 +01:00