Merge branch 'master' of github.com:nicksergeant/snipt

README.md

@@ -9,8 +9,12 @@ getting a local copy running.
 
 1. Clone the repo.
 2. Setup a virtualenv.
-3. `pip install -r requirements`
+3. `pip install -r requirements.txt`
 4. Copy local_settings-template.py to local_settings.py and edit the settings.
-5. Run it!
+5. Comment out [this line](https://github.com/nicksergeant/snipt/blob/master/snipts/models.py#L19) from `snipts/models.py`
+6. `python manage.py syncdb`
+7. `python manage.py migrate`
+8. Uncomment the line in `snipt/models.py`
+9. `python manage.py runserver`
 
 Any problems / questions / bugs, [create an issue](https://github.com/nicksergeant/snipt/issues). Thanks! :)

blogs/templates/blogs/themes/pro-adams/base.html

@@ -85,8 +85,6 @@
                             <li><a href="https://snipt.net/">Snipt</a></li>
                             <li><a href="http://amara.org">Amara</a></li>
                             <li><a href="http://sidepros.com/">SidePros</a></li>
-                            <li><a href="https://github.com/nicksergeant/billmonster/">Bill Monster</a></li>
-                            <li><a href="http://craftofman.com/">Craft of Man</a></li>
                             <li><a href="http://afeedapart.com/">A Feed Apart</a></li>
                             <li><a href="http://rochestermade.com">Rochester Made</a></li>
                             <li><a href="http://refreshroc.org/">Refresh Rochester</a></li>

fabfile.py

@@ -44,7 +44,6 @@ def dep():
         _display_message('Get last commit info')
         ################
 
-        local('./get-last-commit-url.py')
     except:
         pass
 

media/css/style.scss

@@ -1730,7 +1730,7 @@ body.search {
             margin-bottom: 0;
 
             input.search-query {
-                width: 589px;
+                width: 564px;
             }
             button {
                 padding: 4px 16px 4px;

requirements.txt

@@ -6,6 +6,7 @@ Django
 django-annoying
 django-appconf
 django-bcrypt
+django-extensions
 django-markdown-deux
 django-pagination
 django-taggit
@@ -20,6 +21,7 @@ python-postmark
 pyyaml
 simplejson
 South
+stripe
 uuid
 versiontools
 Werkzeug