aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ag/atom-fixes'Lars Hjemli2010-06-195-2/+15
|\
| * Add 'max-atom-items' config variable•••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> Aaron Griffin2010-03-224-1/+9
| * Add all=1 query param for atom feeds•••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> Aaron Griffin2010-03-223-1/+6
* | Merge branch 'lh/noweb'Lars Hjemli2010-06-191-0/+2
|\ \
| * | scan-tree: add test for noweb-file in repo dir•••If such a file exists, the repo is not added to the repolist. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-02-281-0/+2
* | | Merge branch 'ml/plain-improvements-part1'Lars Hjemli2010-06-191-8/+60
|\ \ \
| * | | ui-plain: print directory listings•••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> Mark Lodato2010-01-311-1/+47
| * | | ui-plain: more efficient walk_tree()•••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> Mark Lodato2010-01-311-6/+14
| * | | ui-plain: remove unused curr_rev variable•••Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-01-301-2/+0
* | | | Merge branch 'sn/subject-link'Lars Hjemli2010-06-195-4/+25
|\ \ \ \
| * | | | Optionally generate verbose parent links•••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> Lars Hjemli2010-02-275-5/+24
| * | | | display subject instead of sha1 as link title of parents•••Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Stefan Naewe2010-02-271-3/+5
* | | | | Merge branch 'stable'Lars Hjemli2010-04-081-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | shared.c: avoid memory leak during diff•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-04-081-0/+8
* | | | | ui-tree: add link to plain view for blobs in tree listing•••Suggested-by: Robert Weidlich <mail@robertweidlich.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-02-281-0/+2
| |_|_|/ |/| | |
* | | | Use GIT-1.7.0•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-02-272-1/+1
* | | | Merge branch 'html-updates' of git://github.com/MarkLodato/cgitLars Hjemli2010-02-272-30/+58
|\ \ \ \ | |_|/ / |/| | |
| * | | html: properly percent-escape URLs•••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> Mark Lodato2010-02-091-4/+32
| * | | html: make all strings 'const char *'•••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> Mark Lodato2010-02-082-26/+26
| | |/ | |/|
* | | Merge branch 'stable'Lars Hjemli2010-02-272-3/+3
|\ \ \ | |/ / |/| / | |/
| * Clear the whole context•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Daniel Milde2010-02-271-1/+1
| * ui-shared.c: fix segfault when repo is empty•••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> Florian Pritz2010-02-271-2/+2
* | Merge branch 'stable'Lars Hjemli2009-12-124-4/+4
|\|
| * CGIT 0.8.3.1•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2009-12-121-1/+1
| * Fix segfault on ppc when browsing treeMartins Polakovs2009-12-123-3/+3
* | Add .tar.xz-snapshot support•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Andreas Wiese2009-12-081-4/+10
* | Merge branch 'lh/remote-branches'Lars Hjemli2009-12-085-0/+18
|\ \
| * | Add support for remote branches•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2009-11-075-0/+18
* | | Merge branch 'ro/ssdiff'Lars Hjemli2009-12-0813-25/+586
|\ \ \
| * | | In side-by-side diff, add support for marking individual characters.•••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> Ragnar Ouchterlony2009-11-072-25/+130
| * | | Fixed side-by-side diff bugs related to binary diff and more.•••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> Ragnar Ouchterlony2009-09-162-6/+16
| * | | Polishing of how the side-by-side diff looks.•••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> Ragnar Ouchterlony2009-09-164-30/+96
| * | | Add possibility to switch between unidiff and side-by-side-diff.•••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> Ragnar Ouchterlony2009-09-169-16/+73
| * | | First version of side-by-side diff.•••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> Ragnar Ouchterlony2009-09-165-2/+325
* | | | Merge branch 'master' of http://op-co.de/cgitLars Hjemli2009-12-086-17/+31
|\ \ \ \
| * | | | "max-blob-size" config var to limit generated HTML size•••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> Georg Lukas2009-11-284-0/+14
| * | | | cgit.css: highlight directories in treeGeorg Lukas2009-11-281-0/+5
| * | | | syntax highlighting for all formats supported by "highlight"•••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> Georg Lukas2009-11-191-17/+12
| | |/ / | |/| |
* | | | Merge branch 'stable'Lars Hjemli2009-12-081-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Don't crash when a repo-specific readme file is used•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Sami Kyöstilä2009-12-081-2/+2
* | | Merge branch 'stable'Lars Hjemli2009-11-071-3/+5
|\| |
| * | shared.c: return original errno•••Noticed-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2009-11-071-3/+5
* | | Add NO_OPENSSL option•••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> Mikhail Gusarov2009-11-071-3/+12
* | | Merge branch 'stable'Lars Hjemli2009-11-072-3/+8
|\| |
| * | Close fd on error in readfile()•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Rys Sommefeldt2009-11-071-2/+7
| * | Nov is the correct abbreviationDanijel Tašov2009-11-071-1/+1
* | | ui-shared.c: prettify download links when generated from tag page•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2009-10-161-2/+7
* | | ui-tag: make output more similar to commit view•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2009-10-061-6/+6
* | | ui-tag: add snapshot links•••Signed-off-by: Alexey Nezhdanov <snakeru@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Alexey Nezhdanov2009-10-061-0/+12
* | | Skip leading "/" in url querystring value•••Makes it easier to rewrite :) lighttpd-sandbox: rewrite "/cgit.cgi?url=%{enc:request.path}&%{request.query}"; Signed-off-by: Stefan Bühler <source@stbuehler.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Stefan Bühler2009-10-061-0/+2
|/ /