disinclined.org / git / dylansserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6f04d2b 6b53559)
Merge branch 'archive' into dev
authorDylan Lloyd <dylan@psu.edu>
Sun, 6 Mar 2011 17:42:42 +0000 (12:42 -0500)
committerDylan Lloyd <dylan@psu.edu>
Sun, 6 Mar 2011 17:42:42 +0000 (12:42 -0500)
commitf870b65ad60d8ea7456384d38f8db6fd01275990
tree30858b3bcda398af57a0e9eb6b20d710a630cb48tree
parent6f04d2b1c7461b1c50dd3c9f895baabafc4d6db4commit | diff
parent6b53559cb12395709e95721c31ea99cfccfa3808commit | diff
Merge branch 'archive' into dev

Decided to just go ahead and merge the archive feature.

Also fixed archive pages to ORDER BY date_posted DESC.

Also fixed formatting error on archive pages (.note's should be in #notes)
.htaccess diff1 | diff2 | blob | history
index.php diff1 | diff2 | blob | history
my (old) website