Merge branch 'release/0.0.35'

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
   - "2.7"
   - "3.4"
+  - "3.5"
 env:
   matrix:
    - DJANGO="Django<1.9"

CONTRIBUTORS.md

@@ -0,0 +1,10 @@
+django-qa was started by Arjun Komath (<arjunkomath@gmail.com>) in 2015 as a
+way to have a simple and pluggable Q&A App for Django projects.
+
+Contributors
+============
+Arjun Komath
+Cristian Vargas
+Sebastian Reyes
+Jose Ariza
+The SWAPPS development team

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Arjun Komath
+Copyright (c) 2016 Arjun Komath and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,4 +1,6 @@
-include README.md
+include README.rst
+include CONTRIBUTORS.md
+include LICENSE.md
 recursive-include qa/templates *
 recursive-include qa/static *
 recursive-include qa/migrations *

README.rst

@@ -9,6 +9,17 @@ WELCOME TO DJANGO-QA
    :alt: Coveralls Status
    :target: https://coveralls.io/github/swappsco/django-qa?branch=master
 
+.. image:: https://img.shields.io/pypi/v/django-qa.svg
+   :alt: PyPi latest version
+   :target: https://pypi.python.org/pypi/django-qa/
+
+.. image:: https://img.shields.io/pypi/status/django-qa.svg
+   :alt: Development status
+
+.. image:: https://requires.io/github/swappsco/django-qa/requirements.svg?branch=master
+     :target: https://requires.io/github/swappsco/django-qa/requirements/?branch=master
+     :alt: Requirements Status
+
 A Simple Q&A App using Python Django
 ====================================
 django-qa_ is a fork from Simple-Q-A-App-using-Python-Django_ aimed to create a pluggable package than allows to implement a StackOverflow-like forum site for your Django web project.

qa/templates/qa/base.html

@@ -1,3 +1,4 @@
+{% load staticfiles %}
 <div class="topbar"></div>
 <div class="container">
 <title>Simple QA</title>
@@ -8,7 +9,7 @@
 
 <link href='http://fonts.googleapis.com/css?family=Roboto:300' rel='stylesheet' type='text/css'>
 <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-<link href="static/css/qa.css" rel="stylesheet"/>
+<link href="{% static 'css/qa.css' %}" rel="stylesheet"/>
 
 <div class="page-header">
   <a class="btn btn-lg btn-warning pull-right" href="#search"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Find</a><a class="btn btn-lg btn-danger pull-right" href="{% url 'qa_create_question' %}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ask Question</a><h1><a href="{% url 'qa_index' %}"><img width="50px" src="http://icons.iconarchive.com/icons/seanau/flat-app/256/Questionmark-icon.png" /><orange>Simple QA</orange> </a><small>Open Questions</small></h1>

requirements.txt

@@ -1,5 +1,5 @@
-django-annoying==0.9.0
-django_bootstrap3==7.0.0
-django-markdown-app==0.8.6
+django-annoying==0.10.3
+django_bootstrap3==7.1.0
+django-markdown-app==0.9.0
 django-taggit==0.21.3
-pytz==2016.6.1
+pytz==2016.7

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='django-qa',
-    version='0.0.34',
+    version='0.0.35',
     description='Pluggable django app for Q&A',
     long_description=long_description,
     author='arjunkomath, cdvv7788, sebastian-code, jlariza, swappsco',
@@ -18,19 +18,26 @@
     packages=find_packages(),
     classifiers=[
         'Development Status :: 4 - Beta',
-        'Framework :: Django',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Internet',
+        'Environment :: Web Environment',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Framework :: Django',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
     ],
     install_requires=[
-        'django-annoying==0.9.0',
-        'django-markdown-app==0.8.6',
+        'django-annoying==0.10.3',
+        'django-markdown-app==0.9.0',
         'django-taggit==0.21.3',
-        'pytz==2016.6.1'
+        'pytz==2016.7'
     ],
     extras_require={
         'i18n': [