remove merges from changelog on website, unclobber config.d

master
Jacob Parker 11 years ago
parent 4068e64a47
commit 1d5c58560d
  1. 4
      .htaccess
  2. 2
      bin/changelog.sh
  3. 12
      src/config.d

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

@ -1,3 +1,3 @@
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>"

@ -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_subtitle = "but this is a subtitle";
const string site_title = "CSC";
const string site_subtitle = "UW Computer Science Club";
const bool nav_tree_vert = true;
const bool nav_tree_chev = true;
const bool page_container = false;
const bool nav_tree_vert = false;
const bool nav_tree_chev = false;
const bool page_container = true;
string[string] handlers;

Loading…
Cancel
Save