aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* ui-log.c: allow commit range as search expressionLars Hjemli2010-06-19
| | | | | Inspired-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Fix style of commit-filter links in commit-subject.Johan Herland2010-06-19
| | | | | | | | | | | | When using the commit-filter functionality to add e.g. bug tracker links to commit messages, the style of those links is mangled by a CSS directive that is meant to only apply to decorations that are listed on the commit-subject line. Fix this directive to only apply to the decorations. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Merge branch 'stable'Lars Hjemli2010-06-19
|\
| * CGIT 0.8.3.2v0.8.3.2Lars Hjemli2010-06-19
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'ag/atom-fixes'Lars Hjemli2010-06-19
|\ \
| * | Add 'max-atom-items' config variableAaron Griffin2010-03-22
| | | | | | | | | | | | | | | | | | | | | This allows one to specify the items in the RSS feeds Signed-off-by: Aaron Griffin <agriffin@datalogics.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add all=1 query param for atom feedsAaron Griffin2010-03-22
| | | | | | | | | | | | | | | | | | | | | Displays all items from all branches in one feed Signed-off-by: Aaron Griffin <agriffin@datalogics.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'lh/noweb'Lars Hjemli2010-06-19
|\ \ \
| * | | scan-tree: add test for noweb-file in repo dirLars Hjemli2010-02-28
| | | | | | | | | | | | | | | | | | | | | | | | If such a file exists, the repo is not added to the repolist. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'ml/plain-improvements-part1'Lars Hjemli2010-06-19
|\ \ \ \
| * | | | ui-plain: print directory listingsMark Lodato2010-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | | | ui-plain: more efficient walk_tree()Mark Lodato2010-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | | | ui-plain: remove unused curr_rev variableMark Lodato2010-01-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mark Lodato <lodatom@gmail.com>
* | | | | Merge branch 'sn/subject-link'Lars Hjemli2010-06-19
|\ \ \ \ \
| * | | | | Optionally generate verbose parent linksLars Hjemli2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option 'enable-subject-links' must be used to enable the verbose parent-links in commit view. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | | display subject instead of sha1 as link title of parentsStefan Naewe2010-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | | Merge branch 'stable'Lars Hjemli2010-04-08
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | shared.c: avoid memory leak during diffLars Hjemli2010-04-08
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | ui-tree: add link to plain view for blobs in tree listingLars Hjemli2010-02-28
| |_|_|/ |/| | | | | | | | | | | | | | | Suggested-by: Robert Weidlich <mail@robertweidlich.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Use GIT-1.7.0Lars Hjemli2010-02-27
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'html-updates' of git://github.com/MarkLodato/cgitLars Hjemli2010-02-27
|\ \ \ \ | |_|/ / |/| | |
| * | | html: properly percent-escape URLsMark Lodato2010-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only valid characters for a URL are unreserved characters a-zA-Z0-9_-.~ and the reserved characters !*'();:@&=+$,/?%#[] , as per RFC 3986. Everything else must be escaped. Additionally, the # and ? always have special meaning, and the &, =, and + have special meaning in a query string, so they too must be escaped. To make this easier, a table of escapes is now used so that we do not have to call fmt() for each character; if the entry is 0, no escaping is needed. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | | html: make all strings 'const char *'Mark Lodato2010-02-08
| | |/ | |/| | | | | | | | | | | | | | | | | | | None of the html_* functions modify their argument, so they can all be 'const char *' instead of a simple 'char *'. This removes the need to cast (or copy) when trying to print a const string. Signed-off-by: Mark Lodato <lodatom@gmail.com>
* | | Merge branch 'stable'Lars Hjemli2010-02-27
|\ \ \ | |/ / |/| / | |/
| * Clear the whole contextDaniel Milde2010-02-27
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-shared.c: fix segfault when repo is emptyFlorian Pritz2010-02-27
| | | | | | | | | | | | | | | | | | PATH_INFO="/$REPONAME/commit/?id=1" QUERY_STRING="id=1" ./cgit.cgi triggers segfault when the repository is empty and therefore ctx.qry.head is unset Signed-off-by: Florian Pritz <bluewind@xssn.at> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2009-12-12
|\ \ | |/
| * CGIT 0.8.3.1v0.8.3.1Lars Hjemli2009-12-12
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * Fix segfault on ppc when browsing treeMartins Polakovs2009-12-12
| |
* | Add .tar.xz-snapshot supportAndreas Wiese2009-12-08
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'lh/remote-branches'Lars Hjemli2009-12-08
|\ \
| * | Add support for remote branchesLars Hjemli2009-11-07
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'ro/ssdiff'Lars Hjemli2009-12-08
|\ \ \
| * | | In side-by-side diff, add support for marking individual characters.Ragnar Ouchterlony2009-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refuses to do so if the left hand side of the diff has different amount of differing lines to the right hand side to avoid confusion. Note that I use the naive dynamic programming approach for calculating the longest common subsequence. We could probably be more efficient by using a better algorithm. The LCS calculating function is O(n*m) and uses up n*m amount of memory too (so if we we compare two strings of length 100, I use an array of 10000 for calculating the LCS). Might want to not calculate LCS if the length of the line is too large. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
| * | | Fixed side-by-side diff bugs related to binary diff and more.Ragnar Ouchterlony2009-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixed bugs: * "Binary files differ" did not show up either in unidiff or side-by-side-diff. * Subproject diffs did not work for side-by-side diffs. * The ssdiff link on diff pages did not conserve the path. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Polishing of how the side-by-side diff looks.Ragnar Ouchterlony2009-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligned all different files, so that all side-by-side tables look the same. Also made sure that the tables take up the whole browser width. Also various changes to the css to make things easier on the eye. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add possibility to switch between unidiff and side-by-side-diff.Ragnar Ouchterlony2009-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new config option side-by-side-diffs added, defaulting to 0, meaning unidiff. Also a query option (ss) is used toggle this. In the commit page you can switch between the two diff formats by clicking on the link on the "commit"-row, to the right of (patch). In the diff page you can switch by using the link at the start of the page. All commit-links and diff-links will remember the choice. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | First version of side-by-side diff.Ragnar Ouchterlony2009-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This constitutes the first prototype of a side-by-side diff. It is not possible to switch between unidiff and side-by-side diff at all at this stage. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'master' of http://op-co.de/cgitLars Hjemli2009-12-08
|\ \ \ \
| * | | | "max-blob-size" config var to limit generated HTML sizeGeorg Lukas2009-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is not feasible to generate the HTML pretty-print for large files, especially if a source-filter is involved or binary data is to be displayed. The "max-blob-size" config var allows to disable HTML output for blobs bigger than X KBytes. Plain downloads are not affected. Signed-off-by: Georg Lukas <georg@op-co.de>
| * | | | cgit.css: highlight directories in treeGeorg Lukas2009-11-28
| | | | |
| * | | | syntax highlighting for all formats supported by "highlight"Georg Lukas2009-11-19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The highlight tool can be given any of the supported file extensions as its -S parameter. This patch replaces the case-switch by extracting the extension from the supplied file name and passing it to highlight. However, this requires a shell supporting the ${var##pattern} syntax, like dash or bash. Unknown extensions cause a fall-back to plain text using the --force switch. Error messages are redirected to /dev/null. A special case maps Makefile and Makefile.* to the "mk" extension. The total overhead is reduced by calling "exec highlight". No forks are needed during script execution. Signed-off-by: Georg Lukas <georg@op-co.de>
* | | | Merge branch 'stable'Lars Hjemli2009-12-08
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Don't crash when a repo-specific readme file is usedSami Kyöstilä2009-12-08
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Lars Hjemli2009-11-07
|\ \ \ | |/ /
| * | shared.c: return original errnoLars Hjemli2009-11-07
| | | | | | | | | | | | | | | Noticed-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Add NO_OPENSSL optionMikhail Gusarov2009-11-07
| | | | | | | | | | | | | | | | | | | | | Linking with OpenSSL is not always desirable. Add NO_OPENSSL option to use SHA-1 code bundled with Git. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
* | | Merge branch 'stable'Lars Hjemli2009-11-07
|\ \ \ | |/ /
| * | Close fd on error in readfile()Rys Sommefeldt2009-11-07
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Nov is the correct abbreviationDanijel Tašov2009-11-07
| | |