author | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Dec 2009 19:28:15 +0000 (11:28 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Dec 2009 19:28:15 +0000 (11:28 -0800) | ||
commit | 8678bc09e3a553fdacfbf7f8493e400c399f8e7b | |
tree | 91306cb18175d699dc7fd375609b7882df081704 | tree | snapshot |
parent | 9eba92f684ad9fb1b2e9b99f3f406048fece266d | commit | diff |
parent | 87e573f660dd0e871f3eb673d0b856488b6d8336 | commit | diff |
Merge branch 'jn/gitweb-blame'
* jn/gitweb-blame:
gitweb: Add link to other blame implementation in blame views
gitweb: Make linking to actions requiring JavaScript a feature
gitweb.js: fix padLeftStr() and its usage
gitweb.js: Harden setting blamed commit info in incremental blame
gitweb.js: fix null object exception in initials calculation
gitweb: Minify gitweb.js if JSMIN is defined
gitweb: Create links leading to 'blame_incremental' using JavaScript
gitweb: Colorize 'blame_incremental' view during processing
gitweb: Incremental blame (using JavaScript)
gitweb: Add optional "time to generate page" info in footer
Conflicts:
Makefile
gitweb/gitweb.css
* jn/gitweb-blame:
gitweb: Add link to other blame implementation in blame views
gitweb: Make linking to actions requiring JavaScript a feature
gitweb.js: fix padLeftStr() and its usage
gitweb.js: Harden setting blamed commit info in incremental blame
gitweb.js: fix null object exception in initials calculation
gitweb: Minify gitweb.js if JSMIN is defined
gitweb: Create links leading to 'blame_incremental' using JavaScript
gitweb: Colorize 'blame_incremental' view during processing
gitweb: Incremental blame (using JavaScript)
gitweb: Add optional "time to generate page" info in footer
Conflicts:
Makefile
gitweb/gitweb.css
Makefile | diff1 | | diff2 | | blob | history |
git-instaweb.sh | diff1 | | diff2 | | blob | history |
gitweb/README | diff1 | | diff2 | | blob | history |
gitweb/gitweb.css | diff1 | | diff2 | | blob | history |
gitweb/gitweb.perl | diff1 | | diff2 | | blob | history |