aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | | Merge branch 'stable'Gravatar Lars Hjemli2009-01-12-2/+3
|\ \ \ \ | |/ / /
| * | | ui-tag: escape tagnames properlyGravatar Lars Hjemli2009-01-12-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Change toggle to more meaningful termGravatar Justin Waters2009-01-11-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'Gravatar Lars Hjemli2009-01-11-13/+15
|\ \ \ \
| * | | | tests/t0107-snapshot.sh: make testscript match updated snapshot behaviorGravatar Lars Hjemli2008-12-28-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | return 404 if snapshot is not foundGravatar Natanael Copa2008-12-28-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'lh/mimetypes'Gravatar Lars Hjemli2009-01-11-3/+3
|\ \ \ \ \
| * | | | | ui-snapshot.c: change mime-type for tar.gz and tar.bz2Gravatar Lars Hjemli2008-12-26-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge branch 'lh/virtual-root'Gravatar Lars Hjemli2009-01-11-20/+21
|\ \ \ \ \
| * | | | | Untie logic for SCRIPT_NAME and PATH_INFOGravatar Lars Hjemli2008-12-26-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge branch 'stable'Gravatar Lars Hjemli2009-01-11-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Makefile: avoid libcurl when building gitGravatar Lars Hjemli2009-01-10-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>
* | | | | | ui-log: show name-decorations in log outputGravatar Lars Hjemli2009-01-11-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>
* | | | | | ui-refs: avoid SEGFAULT on lightweight tagsGravatar Robin Redeker2009-01-10-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'stable'Gravatar Lars Hjemli2009-01-07-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | ui-tree.c: do not add blank line when displaying blobsGravatar Lars Hjemli2009-01-07-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>
* | | | | Merge branch 'stable'Gravatar Lars Hjemli2008-12-30-2/+2
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | ui-patch: whitespace changes in the patch generation code</