Merge pull request #73 from rafalp/develop

Travis configuration

README.md

@@ -1,8 +1,11 @@
-# Misago [![Build Status](https://travis-ci.org/rafalp/Misago.png)](https://travis-ci.org/rafalp/Misago)
+# Misago
 
 Misago is an internet forum application written in Python and using Django as its foundation.
 Visit project homepage for discussion and demo: <http://misago-project.org>
 
+**Master Branch:** [![Build Status](https://travis-ci.org/rafalp/Misago.png?branch=master)](https://travis-ci.org/rafalp/Misago)
+
+**Development Branch:** [![Build Status](https://travis-ci.org/rafalp/Misago.png?branch=develop)](https://travis-ci.org/rafalp/Misago)
 
 The Tao AKA Mission Statement
 -----------------------------

deployment/settings.py

@@ -20,9 +20,10 @@ ADMINS = ()
 
 # Secret key is used by Django and Misago in hashes generation
 # YOU MUST REPLACE IT with random combination of characters
+# NEVER EVER SHARE THIS KEY WITH ANYBODY!
 # Make it messed up and long, this is example of good secret key:
-# JA*^Sd09as809!^*(DSA!K1m12o7ds8a791k1#@!829758!@@ii_*091)
-SECRET_KEY = 'CHANGE-ME!'
+# yaobeifl1a6hf&3)^uc#^vlu1ud7xp^+*c5zoq*tf)fvs#*o$#
+SECRET_KEY = 'CHANGE-ME'
 
 # Database connection
 DATABASES = {
@@ -140,8 +141,5 @@ INSTALLED_THEMES = (
     'admin', # Admin theme always last
 )
 
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = ''
-
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'deployment.wsgi.application'

misago/utils/strings.py

@@ -7,6 +7,7 @@ except ImportError:
     use_unidecode = False
 
 def slugify(string):
+    string = unicode(string)
     if use_unidecode:
         string = unidecode(string)
     return django_slugify(string)