aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'stable'Gravatar Lars Hjemli2009-01-30-2/+4
|\
| * html.c: use correct escaping in html attributesGravatar Lars Hjemli2009-01-30-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'Gravatar Lars Hjemli2009-01-28-1/+1
|\ \ | |/
| * CGIT 0.8.1.1Gravatar Lars Hjemli2009-01-28-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'jw/commit-decorations'Gravatar Lars Hjemli2009-01-28-1/+12
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | tests/t0105-commit.sh: expect commit decorationsGravatar Lars Hjemli2009-01-28-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 decorationsGravatar Lars Hjemli2009-01-28-0/+5
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add decorations to commit pagesGravatar Justin Waters2009-01-28-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'Gravatar Lars Hjemli2009-01-28-28/+34
|\ \ \ | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | changed objects are outputted, allowing for selections of code onlyGravatar Onne Gorter2009-01-10-28/+34
| | | |
* | | | Merge branch 'lh/stats'Gravatar Lars Hjemli2009-01-28-4/+569
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cgit.c cgit.css cgit.h ui-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-stats.c: reuse cgit_add_hidden_formfields()Gravatar Lars Hjemli2008-12-07-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-shared: externalize add_hidden_formfields()Gravatar Lars Hjemli2008-12-07-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | This function will be reused by ui-stats.c in the next commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-tree: add link to stats page per pathGravatar Lars Hjemli2008-12-07-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-shared: add and use cgit_stats_link()Gravatar Lars Hjemli2008-12-07-2/+10
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-stats: replace 'enable-stats' setting with 'max-stats'Gravatar Lars Hjemli2008-12-07-58/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new 'max-stats' and 'repo.max-stats' settings makes it possible to define the maximum statistics period, both globally and per repo. Hence, it is now feasible to allow statistics on repositories with a high commit frequency, like linux-2.6, by setting repo.max-stats to e.g. 'month'. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-stats: enable path-filtered statsGravatar Lars Hjemli2008-12-07-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a path is specified on the querystring the commit statistics will now be filtered by this path. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add a 'stats' page to each repoGravatar Lars Hjemli2008-12-07-0/+497
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new page, which is disabled by default, can be used to print some statistics about the number of commits per period in the repository, where period can be either weeks, months, quarters or years. The function can be activated globally by setting 'enable-stats=1' in cgitrc and disabled for individual repos by setting 'repo.enable-stats=0'. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2009-01-12-8/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | Makefile: install cgit.{css,png} in CGIT_DATA_PATHGravatar Todd Zullinger2009-01-12-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 commandGravatar Todd Zullinger2009-01-12-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 exampleGravatar Todd Zullinger2009-01-12-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2009-01-12-2/+6
|\ \ \ \ | |/ / /
| * | | Avoid SEGFAULT on invalid requestsGravatar Lars Hjemli2009-01-12-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 viewableGravatar Robin Redeker2009-01-12-2/+11
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | 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 codeGravatar Tomas Carnecky2008-12-30-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Use GIT-1.6.1Gravatar Lars Hjemli2008-12-26-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | shared.c: future-proof usage of git diff-structuresGravatar Lars Hjemli2008-12-26-1/+3
| |/ / |/| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2008-12-06-2/+9
|\ \ \ | |/ /
| * | tests/setup.sh: allow testsuite to fail properly with POSIX standard shellsGravatar Lars Hjemli2008-12-06-1/+1
| | | | | | | | | | | | | | | | | | | | | The "((expr))" construct is not implemented by e.g. dash, so this commit replaces the construct with a more portable one. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | tests/t0010-validate-html.sh: skip tests if 'tidy' is not availableGravatar Lars Hjemli2008-12-06-1/+8
| | | | | | | | | | | | | | | Noticed-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'full-log'Gravatar Lars Hjemli2008-12-06-13/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: cgit.c cgit.h
| * | | ui-log: use css to make full-log prettierGravatar Lars Hjemli2008-11-30-8/+21
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>