about summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge branch 'stable'Lars Hjemli2011-05-30
|\
| * Properly escape ampersands inside HTML attributesLukas Fleischer2011-05-30
* | ui_repolist: get modtime from packed-refs as fallbackFerry Huberts2011-05-30
* | Merge branch 'lh/panel'Lars Hjemli2011-05-23
|\ \
| * | ui-stats.c: create a control panel for stat optionsLars Hjemli2011-03-07
| * | ui-diff.c: create a control panel for diff optionsLars Hjemli2011-03-06
| * | html.c: add html_intoption()Lars Hjemli2011-03-06
* | | Merge branch 'fh/filter-api'Lars Hjemli2011-05-23
|\ \ \
| * | | shared.c: use execvp() to execute filter commandsLars Hjemli2011-03-26
| * | | filters: document environment variables in filter scriptsFerry Huberts2011-03-26
| * | | cgit_open_filter: hand down repo configuration to scriptFerry Huberts2011-03-26
| * | | cgit_open_filter: also take the repo as a parameterFerry Huberts2011-03-26
| * | | new_filter: determine extra_args from filter typeFerry Huberts2011-03-26
| |/ /
* | | Merge branch 'stable'Lars Hjemli2011-05-23
|\ \ \ | | |/ | |/|
| * | fix virtual-root if script-name is ""Mark Lodato2011-05-23
| * | ui-repolist.c: do not return random/stale data from read_agefileLars Hjemli2011-05-23
| * | Avoid null pointer dereference in cgit_print_diff().Lukas Fleischer2011-05-23
| * | Avoid null pointer dereference in reencode().Lukas Fleischer2011-05-23
| * | Fix memory leak in http_parse_querystring().Lukas Fleischer2011-05-23
| * | Remove unused variable from cgit_diff_tree().Lukas Fleischer2011-05-23
| * | shared.c: do not modify const memoryLars Hjemli2011-05-23
| * | tests: add tests for links with space in path and/or argsLars Hjemli2011-05-23
| * | tests/setup.sh: add support for known bugsLars Hjemli2011-05-23
| * | Fix escaping of paths with spacesJonathon Mah2011-05-23
* | | Merge branch 'dm/disable-clone'Lars Hjemli2011-05-14
|\ \ \
| * | | Return 404 on command not foundDan McGee2011-02-19
| * | | Allow disabling of HTTP clone URLsDan McGee2011-02-19
| * | | Add is_clone flag to available commandsDan McGee2011-02-19
* | | | Merge branch 'stable'Lars Hjemli2011-03-26
|\ \ \ \ | | |/ / | |/| |
| * | | Add advice about scan-path in cgitrc.5.txtJulius Plenz2011-03-26
| * | | fix two encoding bugsJulius Plenz2011-03-26
* | | | make enable-log-linecount independent of -filecountJulius Plenz2011-03-26
|/ / /
* | | new_filter: correctly initialise all arguments for a new filterFerry Huberts2011-03-26
* | | source_filter: fix a memory leakFerry Huberts2011-03-26
* | | cgitrc.5: tar.xz is a supported snapshot formatLars Hjemli2011-03-26
* | | Fix crash when projectsfile cannot be openedStefan Gehn2011-03-26
| |/ |/|
* | CGIT 0.9Lars Hjemli2011-03-05
* | Update READMELars Hjemli2011-03-05
* | ui-diff.c: avoid html injectionLukasz Janyst2011-03-05
* | Merge branch 'stable'Lars Hjemli2011-03-05
|\ \
| * | CGIT 0.8.3.5Lars Hjemli2011-03-05
| * | Avoid trailing slash in virtual-rootLars Hjemli2011-03-05
| * | do not infloop on a query ending in %XY, for invalid hex X or YJim Meyering2011-03-05
| * | ui-shared: silence warningBernhard Reutner-Fischer2011-02-19
| * | Makefile: Make `make get-git` work under OpenBSD.Lukas Fleischer2011-02-19
* | | Merge branch 'br/misc'Lars Hjemli2011-02-19
|\ \ \
| * | | Use transparent background for the cgit logoBernhard Reutner-Fischer2011-02-19
| * | | ssdiff: anchors for ssdiffBernhard Reutner-Fischer2011-02-19
| * | | implement repo.logo and repo.logo-linkBernhard Reutner-Fischer2011-02-19
| | |/ | |/|
* | | Merge branch 'jh/scan-path'Lars Hjemli2011-02-19
|\ \ \
/td> This pulls in the correct value of $(INSTALL) on a wide variety of systems. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13tests: allow shell to be overriddenJohn Keeping On some systems (e.g. Solaris), /bin/sh is not a POSIX shell. Git already provides suitable overrides in its config.mak.uname file and we provide cgit.conf to allow the user to further change this. The code for this is taken from Git's t/Makefile, meaning that we now invoke the tests in the same way that Git does. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13redirect: cleanlinessJason A. Donenfeld 2015-08-13redirect: be more careful for different cgi setupsJason A. Donenfeld 2015-08-12ui-log: fix double countingJohn Keeping This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12log: allow users to follow a fileJohn Keeping Teach the "log" UI to behave in the same way as "git log --follow", when given a suitable instruction by the user. The default behaviour remains to show the log without following renames, but the follow behaviour can be activated by following a link in the page header. Follow is not the default because outputting merges in follow mode is tricky ("git log --follow" will not show merges). We also disable the graph in follow mode because the commit graph is not simplified so we end up with frequent gaps in the graph and many lines that do not connect with any commits we're actually showing. We also teach the "diff" and "commit" UIs to respect the follow flag on URLs, causing the single-file version of these UIs to detect renames. This feature is needed only for commits that rename the path we're interested in. For commits before the file has been renamed (i.e. that appear later in the log list) we change the file path in the links from the log to point to the old name; this means that links to commits always limit by the path known to that commit. If we didn't do this we would need to walk down the log diff'ing every commit whenever we want to show a commit. The drawback is that the "Log" link in the top bar of such a page links to the log limited by the old name, so it will only show pre-rename commits. I consider this a reasonable trade-off since the "Back" button still works and the log matches the path displayed in the top bar. Since following renames requires running diff on every commit we consider, I've added a knob to the configuration file to globally enable/disable this feature. Note that we may consider a large number of commits the revision walking machinery no longer performs any path limitation so we have to examine every commit until we find a page full of commits that affect the target path or something related to it. Suggested-by: René Neumann <necoro@necoro.eu> Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12shared: make cgit_diff_tree_cb publicJohn Keeping This will allow us to use this nice wrapper function elsewhere, avoiding dealing with the diff queue when we only need to inspect a filepair. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12t0110: Chain together using &&Jason A. Donenfeld 2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2015-08-12filters: apply HTML escapingLazaros Koromilas http://www.w3.org/International/questions/qa-escapes#use 2015-08-12git: update to v2.5.0Christian Hesse Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de> 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt