Merge branch 'master' of https://github.com/sh4nks/flaskbb into add_pytest

Conflicts:
	requirements.txt

flaskbb/templates/forum/topic.html

@@ -154,9 +154,11 @@
                 </span>
 
                 <span class="pull-right">
+                    {% if current_user.is_authenticated %}
                     <a href="{{ url_for('forum.report_post', post_id=post.id) }}" onclick="window.open(this.href, 'wio_window','width=500,height=500'); return false;">
                         Report
                     </a> |
+                    {% endif %}
                     {% if current_user|edit_post(post.user_id, topic.forum) %}
                     <a href="{{ url_for('forum.edit_post', post_id=post.id) }}">Edit</a> |
                     {% endif %}

requirements.txt

@@ -20,13 +20,14 @@ Whoosh==2.6.0
 alembic==0.6.3
 blinker==1.3
 itsdangerous==0.23
-postmarkup==1.2.0
 redis==2.9.1
 simplejson==3.3.3
 wsgiref==0.1.2
-http://github.com/miguelgrinberg/Flask-WhooshAlchemy/tarball/master#egg=Flask-WhooshAlchemy
 
 
+https://github.com/miguelgrinberg/Flask-WhooshAlchemy/tarball/master#egg=Flask-WhooshAlchemy
+https://github.com/frol/postmarkup/tarball/master#egg=postmarkup
+
 # Testing
 pytest==2.5.2
-pytest-random==0.02
+pytest-random==0.02

setup.py

@@ -61,14 +61,15 @@ setup(
         'alembic==0.6.3',
         'blinker==1.3',
         'itsdangerous==0.23',
-        'postmarkup==1.2.0',
         'redis==2.9.1',
         'simplejson==3.3.3',
         'wsgiref==0.1.2',
-        'Flask-WhooshAlchemy'
+        'Flask-WhooshAlchemy',
+        'postmarkup'
     ],
     dependency_links=[
-        'http://github.com/miguelgrinberg/Flask-WhooshAlchemy/tarball/master#egg=Flask-WhooshAlchemy'
+        'https://github.com/miguelgrinberg/Flask-WhooshAlchemy/tarball/master#egg=Flask-WhooshAlchemy',
+        'https://github.com/frol/postmarkup/tarball/master#egg=postmarkup'
     ],
     classifiers=[
         'Development Status :: 4 - Beta',