aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | Add support for 'enable-gitweb-owner' optionGravatar Jason A. Donenfeld2010-08-04-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add support for 'remove-suffix' optionGravatar Jason A. Donenfeld2010-08-04-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add support for 'project-list' optionGravatar Jason A. Donenfeld2010-08-04-8/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'js/notes'Gravatar Lars Hjemli2010-08-04-0/+57
|\ \ \
| * | | ui-log: Display git notes when presentGravatar Jeff Smith2010-08-04-0/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-commit: Display git notes when presentGravatar Jeff Smith2010-08-04-0/+34
| |/ / | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2010-08-04-13/+15
|\ \ \ | |/ / |/| / | |/
| * CGIT 0.8.3.3Gravatar Lars Hjemli2010-08-04-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-refs.c: avoid segfault on unparsed ref objectsGravatar Lars Hjemli2010-08-04-12/+14
| | | | | | | | | | | | | | | | 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>
* | commit-links.sh: Seperate the expressions for filtering commit messages.Gravatar Jeff Smith2010-07-23-7/+9
| | | | | | | | | | This allows for putting descriptions closer to their expressions. It should also make it clearer how to apply an expression conditionally.
* | Makefile: do not include dependency-file on `make clean`Gravatar Lynn Lin2010-07-23-1/+3
| | | | | | | | | | When envoking clean target, make should not perform the dependency file generation triggered by include.
* | Merge branch 'jh/ignorews'Gravatar Lars Hjemli2010-07-18-12/+40
|\ \
| * | ui-diff: Add link to ignore/show whitespace changes in diffsGravatar Johan Herland2010-07-18-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add URL parameter 'ignorews' for optionally ignoring whitespace in diffsGravatar Johan Herland2010-07-18-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'lh/macros'Gravatar Lars Hjemli2010-07-18-5/+78
|\ \ \
| * | | Add support for environment variable expansionGravatar Lars Hjemli2010-03-22-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2010-07-14-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Reencode author and committerGravatar Rémi Lagacé2010-07-14-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'lh/range-search'Gravatar Lars Hjemli2010-06-22-4/+8
|\ \ \ \
| * | | | ui-log.c: allow commit range as search expressionGravatar Lars Hjemli2010-06-19-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'jh/context-lines'Gravatar Lars Hjemli2010-06-22-8/+34
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: cgit.c cgit.h
| * | | | ui-diff: Add links to increase/decrease number of context lines in diffsGravatar Johan Herland2010-06-19-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Add URL parameter 'context' for changing the number of context lines in diffsGravatar Johan Herland2010-06-19-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge branch 'jh/path-limit'Gravatar Lars Hjemli2010-06-22-164/+275
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | Conflicts: cgit.h ui-commit.c
| * | | ui-shared.c: path-limit style nitpickGravatar Lars Hjemli2010-06-19-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This subjectively makes the path-limit bar less visually intrusive. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-log: Preserve path limit in outgoing linksGravatar Johan Herland2010-06-19-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ui-shared: Preserve path limit in "tab bar" links