dylansserver.git
13 years agoAdded overflow:auto to pre
Dylan Lloyd [Tue, 14 Jun 2011 19:38:58 +0000 (15:38 -0400)] 
Added overflow:auto to pre

13 years agoAdded @font-faces
Dylan Lloyd [Tue, 14 Jun 2011 08:16:11 +0000 (04:16 -0400)] 
Added @font-faces

13 years agoFixed css font -> font-size for exhibits
Dylan Lloyd [Wed, 8 Jun 2011 01:51:20 +0000 (21:51 -0400)] 
Fixed css font -> font-size for exhibits

13 years agoRemoved 'lucida console' font from exhibits
Dylan Lloyd [Wed, 8 Jun 2011 01:49:11 +0000 (21:49 -0400)] 
Removed 'lucida console' font from exhibits

13 years agoAdded missing >, fixed validation warning
Dylan Lloyd [Wed, 8 Jun 2011 01:43:18 +0000 (21:43 -0400)] 
Added missing >, fixed validation warning

13 years agoFixed overzealous commit d215663 which broke script-disabled fallback
Dylan Lloyd [Wed, 8 Jun 2011 01:41:09 +0000 (21:41 -0400)] 
Fixed overzealous commit d215663 which broke script-disabled fallback

13 years agoshortened .exhibit min-height
Dylan Lloyd [Tue, 7 Jun 2011 05:18:40 +0000 (01:18 -0400)] 
shortened .exhibit min-height

13 years agomoved / into anchor link of notes backlinkk
Dylan Lloyd [Tue, 7 Jun 2011 05:14:11 +0000 (01:14 -0400)] 
moved / into anchor link of notes backlinkk

13 years agoadded margin-top to #comments
Dylan Lloyd [Tue, 7 Jun 2011 05:10:58 +0000 (01:10 -0400)] 
added margin-top to #comments

13 years agoremoved all inline styles
Dylan Lloyd [Tue, 7 Jun 2011 05:09:55 +0000 (01:09 -0400)] 
removed all inline styles

13 years agoindex page fixed
Dylan Lloyd [Tue, 7 Jun 2011 05:03:16 +0000 (01:03 -0400)] 
index page fixed

13 years agoNotes and comments look good, index does not
Dylan Lloyd [Tue, 7 Jun 2011 04:56:46 +0000 (00:56 -0400)] 
Notes and comments look good, index does not

13 years agoRecaptcha form cleaned up
Dylan Lloyd [Wed, 20 Apr 2011 16:31:20 +0000 (12:31 -0400)] 
Recaptcha form cleaned up

Fixed extra slash and missing title after switching to audio. Moved the textbox and help links down, added padding to post link.

13 years agoMerge branch 'rss' into dev
Dylan Lloyd [Sun, 10 Apr 2011 06:48:45 +0000 (02:48 -0400)] 
Merge branch 'rss' into dev

Conflicts:
.htaccess
index.php

13 years agoAdded link to feed
Dylan Lloyd [Sun, 10 Apr 2011 06:46:39 +0000 (02:46 -0400)] 
Added link to feed

13 years agoMerged branch 'dev' into rss
Dylan Lloyd [Sun, 10 Apr 2011 06:45:11 +0000 (02:45 -0400)] 
Merged branch 'dev' into rss

13 years agoMerge branch 'live' into dev
Dylan Lloyd [Sat, 9 Apr 2011 01:10:42 +0000 (21:10 -0400)] 
Merge branch 'live' into dev

13 years agoHOTFIX: this should have been committed...
Dylan Lloyd [Sat, 9 Apr 2011 01:08:16 +0000 (21:08 -0400)] 
HOTFIX: this should have been committed...

13 years agoFixed spacing issue with note titles
Dylan Lloyd [Sun, 27 Mar 2011 20:25:28 +0000 (16:25 -0400)] 
Fixed spacing issue with note titles

13 years agoMerge branch 'live' into seo
Dylan Lloyd [Sun, 27 Mar 2011 20:19:42 +0000 (16:19 -0400)] 
Merge branch 'live' into seo

13 years agoMerge branch 'live' of dylansserver.com:dylansserver into live
Dylan Lloyd [Sat, 26 Mar 2011 20:05:22 +0000 (16:05 -0400)] 
Merge branch 'live' of dylansserver.com:dylansserver into live

13 years agoMerge branch 'dev' of dylansserver.com:dylansserver into dev
Dylan Lloyd [Sat, 26 Mar 2011 20:05:10 +0000 (16:05 -0400)] 
Merge branch 'dev' of dylansserver.com:dylansserver into dev

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 26 Mar 2011 20:04:38 +0000 (16:04 -0400)] 
Merge branch 'dev' into live

13 years agoRenamed all.js -> index.js
Dylan Lloyd [Sat, 26 Mar 2011 20:04:12 +0000 (16:04 -0400)] 
Renamed all.js -> index.js

13 years agoMoved script logic to respective classes
Dylan Lloyd [Sat, 26 Mar 2011 20:02:48 +0000 (16:02 -0400)] 
Moved script logic to respective classes

13 years agoConcatenated comment js files
Dylan Lloyd [Sat, 26 Mar 2011 19:49:03 +0000 (15:49 -0400)] 
Concatenated comment js files

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 26 Mar 2011 07:05:18 +0000 (03:05 -0400)] 
Merge branch 'dev' into live

13 years agoFixed favicon links
Dylan Lloyd [Sat, 26 Mar 2011 07:05:11 +0000 (03:05 -0400)] 
Fixed favicon links

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 26 Mar 2011 04:06:33 +0000 (00:06 -0400)] 
Merge branch 'dev' into live

13 years agoSwitched from dylanstestserver to dylansserver
Dylan Lloyd [Sat, 26 Mar 2011 04:06:29 +0000 (00:06 -0400)] 
Switched from dylanstestserver to dylansserver

13 years agoAdded canonical URL's on /page/'s
Dylan Lloyd [Fri, 25 Mar 2011 21:36:51 +0000 (17:36 -0400)] 
Added canonical URL's on /page/'s

See http://googlewebmastercentral.blogspot.com/2009/02/specify-your-can

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Fri, 25 Mar 2011 07:39:55 +0000 (03:39 -0400)] 
Merge branch 'dev' into live

13 years agoRestored accidently deleted line.
Dylan Lloyd [Fri, 25 Mar 2011 07:39:49 +0000 (03:39 -0400)] 
Restored accidently deleted line.

13 years agoChanged note titles to H1s
Dylan Lloyd [Fri, 25 Mar 2011 07:25:21 +0000 (03:25 -0400)] 
Changed note titles to H1s

Also moved date styling to style.css.

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Fri, 25 Mar 2011 03:37:39 +0000 (23:37 -0400)] 
Merge branch 'dev' into live

13 years agoAdded in RewriteRule for gitweb
Dylan Lloyd [Fri, 25 Mar 2011 03:37:35 +0000 (23:37 -0400)] 
Added in RewriteRule for gitweb

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Fri, 25 Mar 2011 02:42:49 +0000 (22:42 -0400)] 
Merge branch 'dev' into live

13 years agoFixed error when .swp files in /notes or /projects
Dylan Lloyd [Fri, 25 Mar 2011 02:40:28 +0000 (22:40 -0400)] 
Fixed error when .swp files in /notes or /projects

13 years agopre and p padding fixes
Dylan Lloyd [Fri, 25 Mar 2011 01:31:57 +0000 (21:31 -0400)] 
pre and p padding fixes

13 years agoMerge branch 'ajax' into dev
Dylan Lloyd [Fri, 25 Mar 2011 00:18:17 +0000 (20:18 -0400)] 
Merge branch 'ajax' into dev

13 years agoNo reason that's in here I don't think
Dylan Lloyd [Fri, 25 Mar 2011 00:05:37 +0000 (20:05 -0400)] 
No reason that's in here I don't think

13 years agoFixed div error in index.php
Dylan Lloyd [Thu, 24 Mar 2011 23:28:26 +0000 (19:28 -0400)] 
Fixed div error in index.php

Fixed error stopping the javascript exhibit display on the index page. The error was very strange (as in why the code was there, the fix was simple), I tried to track down its origin with blame, but git lost the history after a rename. This was already fixed in branch dev, but it was not a distinct commit. Still validating (at least the index page).

13 years agoadded site section to sample.ini
Dylan Lloyd [Thu, 24 Mar 2011 02:12:58 +0000 (22:12 -0400)] 
added site section to sample.ini

13 years agoadded recaptcha section to sample.ini
Dylan Lloyd [Thu, 24 Mar 2011 02:10:28 +0000 (22:10 -0400)] 
added recaptcha section to sample.ini

13 years agoMoved projects/ out of repo.
Dylan Lloyd [Wed, 23 Mar 2011 02:08:04 +0000 (22:08 -0400)] 
Moved projects/ out of repo.

I don't really know why I was versioning these, it doesn't seem appropriate, I wan't to be able to easily change them.

13 years agosed -i s/\"/\'/g projects/* && rm print()s in pub*
Dylan Lloyd [Wed, 23 Mar 2011 01:52:38 +0000 (21:52 -0400)] 
sed -i s/\"/\'/g projects/* && rm print()s in pub*

This fixes a bug introduced in commit f9f5098 that broke the frontpage. The problem was that the method used to force the project page to show up searches for class='notes' but they were ""s in error. It's kind of a crude method in the first place, but it works.

The print statement in ./publish_projects was from debugging a while ago and served no purpose.

13 years agorm #email, fixed & prettied recaptcha errors
Dylan Lloyd [Tue, 22 Mar 2011 08:10:06 +0000 (04:10 -0400)] 
rm #email, fixed & prettied recaptcha errors

13 years agoRecaptcha.reload() solves reload problem
Dylan Lloyd [Mon, 21 Mar 2011 20:21:10 +0000 (16:21 -0400)] 
Recaptcha.reload() solves reload problem

13 years agoRewriteRule for verify now works w/o trailing /
Dylan Lloyd [Thu, 10 Mar 2011 21:43:38 +0000 (16:43 -0500)] 
RewriteRule for verify now works w/o trailing /

13 years agoFixed comment display broken from merge
Dylan Lloyd [Thu, 10 Mar 2011 21:37:06 +0000 (16:37 -0500)] 
Fixed comment display broken from merge

13 years agoCleanup! :%s/I^/ /g and more!
Dylan Lloyd [Thu, 10 Mar 2011 06:36:49 +0000 (01:36 -0500)] 
Cleanup! :%s/I^/  /g and more!

Cherry-picked 4202e89797112d7. No functional changes, only cleanup.

13 years agoFixed validation errors
Dylan Lloyd [Sun, 6 Mar 2011 21:52:37 +0000 (16:52 -0500)] 
Fixed validation errors

Cherry picked e8fefa2acf, all pages without reCAPTCHAs now validate.

13 years agoFixed link error with new post display
Dylan Lloyd [Thu, 10 Mar 2011 10:03:49 +0000 (05:03 -0500)] 
Fixed link error with new post display

13 years agoMore cleanup & formatting
Dylan Lloyd [Thu, 10 Mar 2011 09:39:44 +0000 (04:39 -0500)] 
More cleanup & formatting

13 years agoGot rid of console.log()s and improved formatting
Dylan Lloyd [Thu, 10 Mar 2011 09:17:53 +0000 (04:17 -0500)] 
Got rid of console.log()s and improved formatting

13 years agoImproved styling
Dylan Lloyd [Thu, 10 Mar 2011 09:03:04 +0000 (04:03 -0500)] 
Improved styling

13 years agoNow loads new comment after posting
Dylan Lloyd [Thu, 10 Mar 2011 08:25:31 +0000 (03:25 -0500)] 
Now loads new comment after posting

13 years agoAdded includes/ajax.php, forgot it earlier
Dylan Lloyd [Thu, 10 Mar 2011 08:09:56 +0000 (03:09 -0500)] 
Added includes/ajax.php, forgot it earlier

13 years agoComments now POSTed by AJAX.
Dylan Lloyd [Thu, 10 Mar 2011 05:18:08 +0000 (00:18 -0500)] 
Comments now POSTed by AJAX.

Big problem now is that with JS disabled the CAPTCHA image doesn't load (although it IS fetched from google). I'm not sure why exactly that is. Originally the image was loaded with recaptcha_get_html($this->recaptcha_publickey), but that isn't compatible with the JS load.

Class captcha validates with google and returns the result.

The new comment is not loaded into view after submitting.

The fields should be validated as you go -> special note needs to be taken to consider the javascript-disabled validation and feedback.

Lots of prettying up is necessary with the error messages and such.

It's probably worth spending a commit on code cleanup now, it's getting a bit messy, particularly with the HEREDOCS.

13 years agoreCAPTCHA image now loaded w/ AJAX
Dylan Lloyd [Wed, 9 Mar 2011 21:24:36 +0000 (16:24 -0500)] 
reCAPTCHA image now loaded w/ AJAX

13 years agoCaptcha aligned right, & separated note init logic
Dylan Lloyd [Wed, 9 Mar 2011 10:28:29 +0000 (05:28 -0500)] 
Captcha aligned right, & separated note init logic

13 years agoRSS feed working
Dylan Lloyd [Tue, 8 Mar 2011 20:57:43 +0000 (15:57 -0500)] 
RSS feed working

Trusts note HTML, does not escape! This is acceptable, as only I will be editing the notes, but is worth mentioning again.

The first two sentences are found by locating periods, which is good enough I think.

Haven't added a link to the feed, honestly I'm not sure I want to, it's just nice to have the feature. I want to make sure the /notes/ page stays clean.

URL is /notes/rss

13 years agoFixed /note/'s comment link logic
Dylan Lloyd [Tue, 8 Mar 2011 19:52:49 +0000 (14:52 -0500)] 
Fixed /note/'s comment link logic

13 years agoFixed link typo
Dylan Lloyd [Tue, 8 Mar 2011 19:50:53 +0000 (14:50 -0500)] 
Fixed link typo

13 years agoComment form works!
Dylan Lloyd [Tue, 8 Mar 2011 19:28:24 +0000 (14:28 -0500)] 
Comment form works!

Still needs field validation, and the author/email fields need default values. The way the author/email is displayed above comments needs to be adjusted when there is no email to link to. The comments link on note/ pages should be changed when there are no comments yet.

Most importantly, the note class has gotten sloppy. $this->id is initiated from display_note(), creating a dependency for the form method. This should be moved into the constructor, but some thought should to be given to minimize database queries.

Also a few subtle formatting changes, but I still can't get the reCAPTCHA to align right without floating...

13 years agoAdded form fields and started insert SQL
Dylan Lloyd [Tue, 8 Mar 2011 07:34:53 +0000 (02:34 -0500)] 
Added form fields and started insert SQL

I have NO idea how to get the recaptcha image to align right without floating it, which screws up everything else.

Insert SQL still does not work, I'm thinking there should be a cms->insert method to sanitize the data.

I was thinking about having a cms->sanitize method to abstract the htmlspecialchars() use etc. in case something changes but decided against it.

Now using custom styling for the recaptcha, it already looks much cleaner, but still needs cleaning up.

13 years agoComments now displayed, and captcha functioning
Dylan Lloyd [Tue, 8 Mar 2011 03:50:24 +0000 (22:50 -0500)] 
Comments now displayed, and captcha functioning

There is still no ability to submit a comment, and everything looks very ugly.

index.php is getting uncomfortably big...

13 years agoFixed validation errors
Dylan Lloyd [Sun, 6 Mar 2011 21:52:37 +0000 (16:52 -0500)] 
Fixed validation errors

13 years agoMerge branch 'archive' into dev
Dylan Lloyd [Sun, 6 Mar 2011 17:42:42 +0000 (12:42 -0500)] 
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)

13 years agoSeparated #contact_me method to fix CSS issue on index.php
Dylan Lloyd [Sun, 6 Mar 2011 16:34:04 +0000 (11:34 -0500)] 
Separated #contact_me method to fix CSS issue on index.php

13 years agomv includes/cms.php index.php
Dylan Lloyd [Sun, 6 Mar 2011 16:07:48 +0000 (11:07 -0500)] 
mv includes/cms.php index.php

13 years ago404s now raise notFound exceptions
Dylan Lloyd [Sun, 6 Mar 2011 09:22:39 +0000 (04:22 -0500)] 
404s now raise notFound exceptions

13 years agopublish_notes now takes the time from notes
Dylan Lloyd [Sun, 6 Mar 2011 06:58:21 +0000 (01:58 -0500)] 
publish_notes now takes the time from notes

New notes format ~/docs/notes/note_url.html:

Title
YYYY/MM/DD HH:MM[am|pm]
<p>Lorem ipsum...</p>

13 years agoNow buffering output for errors
Dylan Lloyd [Sun, 6 Mar 2011 06:14:11 +0000 (01:14 -0500)] 
Now buffering output for errors

13 years agoFixed exhibit margins
Dylan Lloyd [Sun, 6 Mar 2011 05:53:45 +0000 (00:53 -0500)] 
Fixed exhibit margins

13 years agoFixed off by one error
Dylan Lloyd [Sun, 6 Mar 2011 05:49:44 +0000 (00:49 -0500)] 
Fixed off by one error

13 years agoAdding support for /notes/YYYY/MM/DD urls
Dylan Lloyd [Sun, 6 Mar 2011 05:47:13 +0000 (00:47 -0500)] 
Adding support for /notes/YYYY/MM/DD urls

It is now working, but the results need to be paginated. There is already a pagination system in use for the page class, so it would nice to turn that into something separate that can be inherited.

13 years agoAdded cms.php
Dylan Lloyd [Sun, 6 Mar 2011 04:19:42 +0000 (23:19 -0500)] 
Added cms.php

...Added cms.php, don't know how I missed that...

Everything works but #contact_me isn't spaced correctly and gets screwy with an exhibit open.

Have realized there is no way to erase what PHP has already printed to the client after issuing a 404. The method of output needs to be changed to allow for this.

Would very much like to implement note lists with /notes/YYYY/MM/DD.

13 years agoNow issues 404 if page # not found
Dylan Lloyd [Sat, 5 Mar 2011 21:07:42 +0000 (16:07 -0500)] 
Now issues 404 if page # not found

13 years agoEverything now comes from cms.php
Dylan Lloyd [Sat, 5 Mar 2011 20:58:12 +0000 (15:58 -0500)] 
Everything now comes from cms.php

Now every page is generated by includes/cms.php. I still need to do more checks to issue 404s appropriately.

Some leftover cruft from past merges was cleaned.

13 years agoMySQL q's are now prepared. Added includes/cms.php
Dylan Lloyd [Thu, 24 Feb 2011 01:02:10 +0000 (20:02 -0500)] 
MySQL q's are now prepared. Added includes/cms.php

All MySQL queries from $_GET are now prepared. This logic has been placed in `$this->query($sql, $data_types, $dirty_data, $dirty_data...)`.

Projects are now also handled by includes/cms.php.

I still don't feel as though the code is entirely DRY, and the object schema still feels somewhat procedural.

The publish_* scripts need to be updated or gotten rid of for a nice interface.

The date_posted storage needs to be switched to datetime, that was a silly decision to start with.

13 years agoMerged branch 'no-javascript' with notes
Dylan Lloyd [Thu, 17 Feb 2011 04:38:42 +0000 (23:38 -0500)] 
Merged branch 'no-javascript' with notes

Now gracefully falls back to friendly URL's when javascript is disabled. Links are adjusted to anchors with javascript on page load.

notes/ are paginated with index.php and rewritten to from /notes/page/# and notes are permalinked at /notes/note_title. index.php loads exhibits from MySQL to allow for this.

notes/ are published via publish.py, and exhibits are published via publish_projects.py. THESE SCRIPTS ARE NOT SAFE - they trust user input implicitly and are chmodded 700.

mysql> show tables;
+----------------------------+
| Tables_in_dylanstestserver |
+----------------------------+
| notes                      |
| projects                   |
+----------------------------+
2 rows in set (0.00 sec)

mysql> desc notes;
+-------------+--------------+------+-----+---------+----------------+
| Field       | Type         | Null | Key | Default | Extra          |
+-------------+--------------+------+-----+---------+----------------+
| id          | int(11)      | NO   | PRI | NULL    | auto_increment |
| date_posted | date         | NO   |     | NULL    |                |
| title       | varchar(255) | NO   |     | NULL    |                |
| text        | longblob     | NO   |     | NULL    |                |
| url         | varchar(255) | NO   |     | NULL    |                |
+-------------+--------------+------+-----+---------+----------------+
5 rows in set (0.00 sec)

mysql> desc projects;
+-------+--------------+------+-----+---------+----------------+
| Field | Type         | Null | Key | Default | Extra          |
+-------+--------------+------+-----+---------+----------------+
| id    | int(11)      | NO   | PRI | NULL    | auto_increment |
| title | varchar(255) | NO   |     | NULL    |                |
| text  | longblob     | NO   |     | NULL    |                |
+-------+--------------+------+-----+---------+----------------+
3 rows in set (0.00 sec)

13 years agonotes/ now working!
Dylan Lloyd [Wed, 16 Feb 2011 06:29:39 +0000 (01:29 -0500)] 
notes/ now working!

13 years agoLooks okay, gotta decide on a cms
Dylan Lloyd [Mon, 14 Feb 2011 09:31:01 +0000 (04:31 -0500)] 
Looks okay, gotta decide on a cms

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 12 Feb 2011 07:54:46 +0000 (02:54 -0500)] 
Merge branch 'dev' into live

13 years agoChanged my repo to link to gitweb
Dylan Lloyd [Sat, 12 Feb 2011 07:54:37 +0000 (02:54 -0500)] 
Changed my repo to link to gitweb

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Fri, 4 Feb 2011 20:52:47 +0000 (15:52 -0500)] 
Merge branch 'dev' into live

13 years agoAdded a 'pragma directive' to declare UTF-8 char encoding
Dylan Lloyd [Fri, 4 Feb 2011 20:52:40 +0000 (15:52 -0500)] 
Added a 'pragma directive' to declare UTF-8 char encoding

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 22 Jan 2011 06:04:27 +0000 (01:04 -0500)] 
Merge branch 'dev' into live

13 years agoAdded a 404.php title and tidy'd it
Dylan Lloyd [Sat, 22 Jan 2011 06:00:03 +0000 (01:00 -0500)] 
Added a 404.php title and tidy'd it

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 22 Jan 2011 05:08:31 +0000 (00:08 -0500)] 
Merge branch 'dev' into live

13 years agoFixed mistake in .htaccess for ErrorDocument 404.
Dylan Lloyd [Sat, 22 Jan 2011 05:05:04 +0000 (00:05 -0500)] 
Fixed mistake in .htaccess for ErrorDocument 404.

The path of the document must begin with a leading / and consist of the full path to the document relative to the DocumentRoot (which is the virtual host root dylanstestserver.com).

Reference here:
http://serverfault.com/questions/81061/htaccess-redirect-of-404-error-just-prints-filename-doesnt-execute-file

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Sat, 22 Jan 2011 05:02:24 +0000 (00:02 -0500)] 
Merge branch 'dev' into live

13 years agoAdded .htaccess and 404.phpfor a custom ErrorDocument.
Dylan Lloyd [Sat, 22 Jan 2011 05:01:48 +0000 (00:01 -0500)] 
Added .htaccess and 404.phpfor a custom ErrorDocument.

13 years agoChanged #portfolio li font-family to sans-serif.
Dylan Lloyd [Sat, 22 Jan 2011 04:54:15 +0000 (23:54 -0500)] 
Changed #portfolio li font-family to sans-serif.

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Tue, 18 Jan 2011 23:51:01 +0000 (18:51 -0500)] 
Merge branch 'dev' into live

13 years agochanged i_like_pandora blurb
Dylan Lloyd [Tue, 18 Jan 2011 23:50:29 +0000 (18:50 -0500)] 
changed i_like_pandora blurb

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Thu, 13 Jan 2011 02:44:18 +0000 (21:44 -0500)] 
Merge branch 'dev' into live

13 years agogot peepshow italic, by adding css for #peepshow_
Dylan Lloyd [Thu, 13 Jan 2011 02:43:00 +0000 (21:43 -0500)] 
got peepshow italic, by adding css for #peepshow_

13 years agoMerge branch 'dev' into live
Dylan Lloyd [Wed, 12 Jan 2011 00:26:50 +0000 (19:26 -0500)] 
Merge branch 'dev' into live