My first rebase

git-rebase-todo

pick 5a5b634 Refactored location code.  Now using County and Neighborhood.  This is kind of hackish and still needs some fixups, but the features I care about are implemented. Make sure your schema mates the supplied db/schema.rb
pick 0aaaaa4 User shouldn't have to be a vendor in order to advertise skills.
pick fcf4de0 No longer link to metro_areas interface on the admin dashboard
pick 865e14f Select all users for displaying on skills index page.
pick 52b5ba2 Query database to find users with skills, even if they are not marked as a vendor.
pick 16a19b4 Welcome about now sends you to your profile instead of welcome_invite.
pick efe156a Fixed up some text and translations.  Some of them are hackish and stored directly in the code instead of lang/
pick 01df5a2 Switching to a graphical drop down user-menu.
pick a039811 Turning off caching on the front page.  I should really fix it so that updatings posts clears this cache.
pick dbd3ba5 Import Google Analytics code.  You must also place a code snippet in your own app scripts to bring in your tracking id.
pick 71d8f81 No longer truncate posts
pick 5df6b28 Adding font tag and size attribute to white list.
pick 3444500 Updated intro text and welcome / signup formatting.
f c3ea976 Forgot to include the links in the welcome text.
r 9128fde Front page: adding tag cloud, removing featured writer
f 8691ab5 Temporarily removing featured writers from the front page.
pick 7ca4a1a Adding our calendar to the front page.
pick 52bc134 Fixing broken dashboard.  Now show neighborhood activity on dashboard.
pick 3b641c8 Added logo to page header.
pick 1fd8ee6 Moving my custom graphics to the correct folder.  This is necessary as part of the 1.0.2 upgrade (desert).
pick 285d1d4 Merged events w/ my hacked neighborhood code.
pick c8e57e7 Replacing events calendar on the front page.
pick 24bd0f7 CSS provided by Nathan.
pick 8080c8f First night of pulling in graphic changes.
pick 851c519 Reset clicknathan.css to latest CSS from Nathan.  Other minor touchups.
r a7ea89a Header is in fairly good shape.  Done for tonight.
f 3f3a187 Some header work.
f 71ab532 Pulling in more header changes.
f 60ec940 Pulling in more header changes.
f 369a67f Header is in fairly good shape.  Done for tongith.
pick cec1e05 Improved drop down menu.
pick 5a5c95c Fixing presentation of subnav in h3 for categories and recent/popular.
pick a6870c1 Updates to post_tools.  Disabled footer content.
f a650611 Lots of updates to post_tools.
f 37f549f Lots more fixups.
f 8947fc6 Recovering lost image.
pick e5dfc6f Lots of home page fixups.
f 34937fe Done for tonight.
pick cb0374b Fixing missing full_location
r 7f3af0b Theme updates.  Refactoring of profile and home page updates.
f 7c1c173 Lots of profile refactoring.
f 56199ba Removing annoying extra div.
f 25c8054 Moving some stuff around.
f cb02f9d Positioning details.
f c6007ff Removing featured writers list from front page.
f a205562 Hide Whats Hot when there are no popular stories.
f ea941dc More tweaks.
pick 00871b3 Fixups
pick 6a54e57 Fixing Something to Contribute.
pick ba079a1 Indenting boxes to make text within leafs
r 7b3d941 Theme tweaks
r b6a5925 Cleaning up CSS and misc fixups
f fbdcec1 Fixups
f 85cc6ea Fix for IE7
f 08fedc4 Cleaning up
pick 66ec229 Footer tweeks
s 112c937 Member Since ...
f 63da3eb Comment Tweeks
s 153e04a Comments starting to look OK.
f 5a977c3 Fixups
s 267da0f Cleaning some stuff up
pick ef54826 Fixes to photos and friends in profiles.
pick a62b83c Removing old google analytics code.  Switching to async version.
pick 6db5ad4 Fixing hyperlink font sizing and some padding
s 2743fa8 Tweeking link hover effect and h6 all 100% width
pick 0038d62 Fixing post_tools.
f 362549b Oops
pick 2c3d7f8 Fixing h6.all for good.
s bafa098 Using _or_date version of time ago
pick 77da423 New signup button and fixed drop down menu graphic.
s 7fa6375 Fix: Layout of related tags.
s 5e2bb4b Adding FreeSerif fallback to fix behavoiur in chromium (and possibly others).
pick b15dfaa Header background and signup button.
pick cf2d02d Cleaning up menu and search box.  Added IE fixes.
pick fe1afa2 Fixed missing translation.
pick 316094c Fixed glitch (friend reqs link) in profile page.  .all class should clear floats to get full width.
pick 1ca02df Much needed improvements to the welcome views.
pick 16a3206 More cleanup and adjustments to the theme.  Impoved: tinyMCE font size, message indicator in header, many others.
s 98f00f7 Don't use Georgia in the header for more consistent cross-platform rendering.
pick 7cbda99 Adding Upcoming Events (Google Calendar).
pick c85a405 Show welcome text if user is not logged in.
pick 78946a7 Fixed bug where posted content would take on special (box) styling for h2 & h3 tags.
pick 935fb78 Minor tweak to profile page.
pick bffb8f2 Add recent photos to the front page.
pick f6ea43c Fixing an error triggered by the google crawler.  Ported from commit: 3a94ba04
pick 022d205 Removing advertise page and routes.  Somehow yahoo was finding this but I'm not sure what is linking to this URL.
pick 836f858 Fix icons on forum pages.
pick 80ca315 Highlight current page in nav bar and remove the link to /popular.  Should now fit on one line.
pick 1e2e71b Changed styling for page headings.
pick 908a322 Custom frontpage text.
pick 58728fe Saving temporary changes to home page before upgrading some system components.
pick 5c093c1 Switching external scripts over to https.
pick 809bc23 Correcting a few mistakes from the last merge.
pick 1a91905 Fixing bug with a named_scope of parents.  Activerecord 2.3.14 doesn't like this and enters an infinite loop while leaking memory.

# Rebase bca2b39..1a91905 onto bca2b39
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#