aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Use GIT-1.7.3•••This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542. Noticed-by: Silvio Cesare <silvio.cesare@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-09-275-8/+8
* | | Merge branch 'stable'Lars Hjemli2010-09-191-2/+2
|\| | | |/ |/|
| * RSS items should always use UTC times•••The format uses a 'Z' suffix, which indicates no TZ offset. Thus we should not respect the local-time config setting here. Signed-off-by: Aaron Griffin <agriffin@datalogics.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Aaron Griffin2010-09-191-2/+2
* | Merge branch 'ml/bugfix'Lars Hjemli2010-09-1912-30/+42
|\ \
| * | prefer html_raw() to write()•••To make the code more consistent, and to not rely on the implementation of html(), always use html_raw(...) instead of write(htmlfd, ...). Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-09-043-12/+12
| * | ui-repolist: fix redefinition of _XOPEN_SOURCE•••Previously, ui-repolist.c set _GNU_SOURCE and then included a standard library before including <git-compat-util.h>. This was a problem, because <git-compat-util.h> redefined _XOPEN_SOURCE, which is set automatically by glibc when _GNU_SOURCE is set. However, <git-compat-util.h> already sets _GNU_SOURCE and includes both <string.h> and <time.h>, so there is no need to define _GNU_SOURCE or include either header within ui-repolist.c. Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-09-041-6/+0
| * | fix errors in printf-style format strings•••There were many places where the arguments to a printf-like function did not match the format string. Mostly, these were a missing 'l' flag, but there were three exceptions: - In ui-stats.c, a size_t argument must be printed. C99 has the "%zu" flag for this purpose, but not all compilers support this. Therefore, we mimic what git does - use a NO_C99_FORMAT Makefile variable. - In ui-stats.c, cgit_print_error() was called with a pointer instead of a character. - In ui-log.c, the "columns" argument was never used. Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-09-046-12/+25
| * | use __attribute__ to catch printf format mistakes•••Use "__attribute__((format (printf,N,M)))", as is done in git, do catch mistakes in printf-style format strings. Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-09-043-0/+5
* | | Merge branch 'lh/section-from-path'•••Conflicts: scan-tree.c Lars Hjemli2010-09-194-6/+45
|\ \ \
| * | | Add support for 'section-from-path' option•••This option can be used to autogenerate section names during scan-path processing. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-08-224-6/+45
* | | | Merge branch 'lh/readme'Lars Hjemli2010-09-196-24/+43
|\ \ \ \
| * | | | Add support for "readme" option•••The value of this option is used as the default value for repo.readme. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-08-226-24/+43
| |/ / /
* | / / Use GIT-1.7.3•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-09-192-1/+1
| |/ / |/| |
* | | Merge branch 'stable'Lars Hjemli2010-09-011-0/+1
|\ \ \ | | |/ | |/|
| * | ui-snapshot: actually compress zip archives•••Since cgit linked with git-1.6.0 all zip archives has been uncompressed. This patch fixes the issue by specifying Z_DEFAULT_COMPRESSION. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-09-011-0/+1
* | | Merge branch 'stable'Lars Hjemli2010-08-292-4/+7
|\| | | |/ |/|
| * html: fix strcpy bug in convert_query_hexchar•••The source and destination strings in strcpy() may not overlap. Instead, use memmove(), which allows overlap. This fixes test t0104, where 'url=foo%2bbar/tree' was being parsed improperly. Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-08-291-4/+5
| * t0108-patch: add 'tests_done' to end•••Signed-off-by: Mark Lodato <lodatom@gmail.com> Mark Lodato2010-08-291-0/+2
* | Use GIT-1.7.2.2•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-08-227-10/+10
* | Support refspecs in about-filter.•••Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Jason A. Donenfeld2010-08-205-7/+63
* | Merge branch 'jd/gitolite'Lars Hjemli2010-08-045-17/+116
|\ \
| * | Add support for 'enable-gitweb-owner' option•••When this option is enabled (which it is by default), cgit will lookup the 'gitweb.owner' setting in each git config file found when processing the 'scan-path' option. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Jason A. Donenfeld2010-08-044-9/+33
| * | Add support for 'remove-suffix' option•••When this option is enabled, the '.git' suffix of repository directories found while processing the 'scan-path' option will be removed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Jason A. Donenfeld2010-08-044-0/+13
| * | Add support for 'project-list' option•••This option specifies the location of a projectlist file as used by gitweb - when 'scan-tree' is later specified, only the projects listed in the projectlist file will be added. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Jason A. Donenfeld2010-08-045-8/+70
* | | Merge branch 'js/notes'Lars Hjemli2010-08-044-0/+57
|\ \ \
| * | | ui-log: Display git notes when present•••Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Jeff Smith2010-08-042-0/+23
| * | | ui-commit: Display git notes when present•••Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Jeff Smith2010-08-043-0/+34
| |/ /
* | | Merge branch 'stable'Lars Hjemli2010-08-032-13/+15
|\ \ \ | |/ / |/| / | |/
| * CGIT 0.8.3.3•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-08-031-1/+1
| * ui-refs.c: avoid segfault on unparsed ref objects•••When a ref refers to something other then a commit or tag object, cgit could segfault when trying to display the tag info. Noticed-by: Eugene Sajine <euguess@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-08-031-12/+14
* | commit-links.sh: Seperate the expressions for filtering commit messages.•••This allows for putting descriptions closer to their expressions. It should also make it clearer how to apply an expression conditionally. Jeff Smith2010-07-221-7/+9
* | Makefile: do not include dependency-file on `make clean`•••When envoking clean target, make should not perform the dependency file generation triggered by include. Lynn Lin2010-07-221-1/+3
* | Merge branch 'jh/ignorews'Lars Hjemli2010-07-187-12/+40
|\ \
| * | ui-diff: Add link to ignore/show whitespace changes in diffs•••Add a link to the "Diffstat" line to ignore/show whitespace changes in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.ignorews variable. Signed-off-by: Johan Herland <johan@herland.net> Johan Herland2010-07-182-0/+15
| * | Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs•••The new ctx.qry.ignorews variable is passed via cgit_diff_files() and cgit_diff_tree() to Git's diff machinery. This is equivalent to passing --ignore-all-space to 'git diff'. Signed-off-by: Johan Herland <johan@herland.net> Johan Herland2010-07-186-12/+25
* | | Merge branch 'lh/macros'Lars Hjemli2010-07-183-5/+78
|\ \ \
| * | | Add support for environment variable expansion•••This patch teaches cgit to expand environment variables in certain cgitrc option values (cache_root, scan-path, include) plus when finding the location of cgitrc itself. One use case for this feature is virtual hosting - e.g. by setting $CGIT_CONFIG='/etc/cgitrc/$HTTP_HOST' in httpd.conf, all virtual hosts automatically gets their own cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-03-223-5/+78
* | | | Merge branch 'stable'Lars Hjemli2010-07-131-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Reencode author and committer•••When a commit has a specific encoding, this encoding also applies to the author and committer name and email. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Rémi Lagacé2010-07-131-0/+4
* | | | Merge branch 'lh/range-search'Lars Hjemli2010-06-222-4/+8
|\ \ \ \
| * | | | ui-log.c: allow commit range as search expression•••Inspired-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-06-192-4/+8
* | | | | Merge branch 'jh/context-lines'•••Conflicts: cgit.c cgit.h Lars Hjemli2010-06-227-8/+34
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ui-diff: Add links to increase/decrease number of context lines in diffs•••Add two links to the "Diffstat" line to show more/less context lines in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.context variable. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Johan Herland2010-06-192-1/+23
| * | | | Add URL parameter 'context' for changing the number of context lines in diffs•••The new ctx.qry.context variable is picked up by cgit_print_diff(), and passed via cgit_diff_files() to Git's diff machinery. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Johan Herland2010-06-196-7/+11
* | | | | Merge branch 'jh/path-limit'•••Conflicts: cgit.h ui-commit.c Lars Hjemli2010-06-2217-164/+275
|\| | | | | |/ / / |/| | |
| * | | ui-shared.c: path-limit style nitpick•••This subjectively makes the path-limit bar less visually intrusive. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2010-06-191-4/+2
| * | | ui-log: Preserve path limit in outgoing links•••This allows navigation through the 'log' page/command without losing the active path limit. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Johan Herland2010-06-191-12/+15
| * | | ui-shared: Preserve path limit in "tab bar" links•••When using the "tab bar" in the pageheader to navigate between pages, any path limit in effect on the current page is forgotten in the link to the target page, even if the target page can interpret and use the path limit constructively. Instead, preserve the current page's path limit in the "tab bar" links to other pages, where the path limit is useful to the target page. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Johan Herland2010-06-191-5/+6
| * | | ui-commit: Preserve path limit in links to commit page•••This includes adding a path argument to cgit_commit_link() and updating all its callers. The callers from within the commit page (i.e. the "commit", "unidiff"/"side-by-side diff" and "parent" links) all preserve the path limit of the current commit page. All other callers pass NULL (i.e. no path limit). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Johan Herland2010-06-195-12/+15
| * | | ui-commit: Preserve path limit in links to tree and diff pages•••For tree links, the original link is unchanged, but in the case of a path limit, a subtree link is added to the right of the original tree link. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Johan Herland2010-06-191-1/+5