public
/
www-new
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove merges from changelog on website, unclobber config.d

This commit is contained in:
Jacob Parker 2012-02-22 17:20:27 -05:00
parent 4068e64a47
commit 1d5c58560d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@ -1,4 +1,4 @@
RewriteEngine on RewriteEngine on
RewriteBase /~j3parker/ RewriteBase /~j3parker/pub/csc/
RewriteRule ^pub/(.*) - [L] RewriteRule ^pub/(.*) - [L]
RewriteRule ^(.*) /users/j3parker/www/bin/web [L] RewriteRule ^(.*) /users/j3parker/www/pub/csc/bin/web [L]

2
bin/changelog.sh
View File

@ -1,3 +1,3 @@
echo "<ul>" echo "<ul>"
git log --pretty=format:'<li>%s - %aN (%ae) <b>(%cr)</b></li>' --abbrev-commit --date=relative git log --pretty=format:'<li>%s - %aN (%ae) <b>(%cr)</b></li>' --abbrev-commit --date=relative --no-merges
echo "</ul>" echo "</ul>"

12
src/config.d
View File

@ -1,11 +1,11 @@
const string url_root = "/~j3parker/"; const string url_root = "/~j3parker/pub/csc/";
const string site_title = "This is a Title"; const string site_title = "CSC";
const string site_subtitle = "but this is a subtitle"; const string site_subtitle = "UW Computer Science Club";
const bool nav_tree_vert = true; const bool nav_tree_vert = false;
const bool nav_tree_chev = true; const bool nav_tree_chev = false;
const bool page_container = false; const bool page_container = true;
string[string] handlers; string[string] handlers;