Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements.txt

flaskbb/templates/forum/forum.html

@@ -58,9 +58,9 @@
 
         {% for topic, topicread in topics.items %}
         <tr>
-            <td width="4%">
+            <td width="4%" style="vertical-align: middle; text-align: center;">
             {% if topic.locked %}
-                <span class="fa fa-locked" style="font-size: 2em"></span>
+                <span class="fa fa-lock" style="font-size: 2em"></span>
             {% else %}
                 {% if topic|topic_is_unread(topicread, current_user, forumsread) %}
                     <span class="fa fa-comment" style="font-size: 2em"></span>

requirements.txt

@@ -10,6 +10,7 @@ Flask-SQLAlchemy==1.0
 Flask-Script==2.0.5
 Flask-Themes2==0.1.3
 Flask-WTF==0.10
+Flask-WhooshAlchemy==0.56
 Jinja2==2.7.3
 Mako==1.0.0
 MarkupSafe==0.23
@@ -22,9 +23,10 @@ alembic==0.6.5
 blinker==1.3
 itsdangerous==0.24
 py==1.4.22
-pytest==2.5.2
+pytest==2.6.0
 pytest-random==0.02
 pytest-cov==1.7.0
 redis==2.10.1
 simplejson==3.6.0
-wsgiref==0.1.2
+
+https://github.com/frol/postmarkup/tarball/master#egg=postmarkup

setup.py

@@ -39,36 +39,39 @@ setup(
     zip_safe=False,
     platforms='any',
     install_requires=[
-        'Flask==0.10.1',
-        'Flask-And-Redis==0.5',
-        'Flask-Cache==0.12',
-        'Flask-DebugToolbar==0.9.0',
-        'Flask-Login==0.2.10',
-        'Flask-Mail==0.9.0',
-        'Flask-Migrate==1.2.0',
-        'Flask-SQLAlchemy==1.0',
-        'Flask-Script==0.6.7',
-        'Flask-Themes2==0.1.3',
-        'Flask-WTF==0.9.4',
-        'Jinja2==2.7.2',
-        'Mako==0.9.1',
-        'MarkupSafe==0.19',
-        'Pygments==1.6',
-        'SQLAlchemy==0.9.3',
-        'WTForms==1.0.5',
-        'Werkzeug==0.9.4',
-        'Whoosh==2.6.0',
-        'alembic==0.6.3',
-        'blinker==1.3',
-        'itsdangerous==0.23',
-        'redis==2.9.1',
-        'simplejson==3.3.3',
-        'wsgiref==0.1.2',
+        'Flask',
+        'Flask-And-Redis',
+        'Flask-Cache',
+        'Flask-DebugToolbar',
+        'Flask-Login',
+        'Flask-Mail',
+        'Flask-Migrate',
+        'Flask-Plugins',
+        'Flask-SQLAlchemy',
+        'Flask-Script',
+        'Flask-Themes2',
+        'Flask-WTF',
         'Flask-WhooshAlchemy',
+        'Jinja2',
+        'Mako',
+        'MarkupSafe',
+        'Pygments',
+        'SQLAlchemy',
+        'WTForms',
+        'Werkzeug',
+        'Whoosh',
+        'alembic',
+        'blinker',
+        'itsdangerous',
+        'py',
+        'pytest',
+        'pytest-random',
+        'pytest-cov',
+        'redis',
+        'simplejson',
         'postmarkup'
     ],
     dependency_links=[
-        'https://github.com/miguelgrinberg/Flask-WhooshAlchemy/tarball/master#egg=Flask-WhooshAlchemy',
         'https://github.com/frol/postmarkup/tarball/master#egg=postmarkup'
     ],
     classifiers=[