Update fork to 0.7.6

.gitignore

@@ -62,3 +62,7 @@ env/
 bower_components
 
 /ekratia/media/
+
+_build
+_static
+_templates

.travis.yml

@@ -0,0 +1,25 @@
+language: python
+
+python:
+  - 2.7
+
+services: postgresql
+
+env:
+  - DJANGO=1.8.6
+
+before_install:
+  - export PYTHONPATH=$HOME/builds/ekratia/ekratia
+  - export PIP_USE_MIRRORS=true
+
+install:
+  - pip install -r requirements.txt
+  - pip install django==$DJANGO --quiet
+  - pip install psycopg2 --quiet
+
+before_script:
+  - psql -c 'create database travis_ci_test;' -U postgres
+
+script:
+  - python manage.py migrate --noinput
+  - python manage.py test --noinput

README.rst

@@ -0,0 +1,47 @@
+.. image:: https://s3.amazonaws.com/ekratiapp/favicon/favicon-96x96.png
+   :target: http://www.ekratia.org
+   :align: center
+
+=======
+Ekratia
+=======
+
+.. image:: https://img.shields.io/github/release/ekratia/ekratia.svg
+    :target: https://github.com/ekratia/ekratia/releases
+    :alt: Release
+.. image:: https://travis-ci.org/ekratia/ekratia.svg
+    :target: https://travis-ci.org/ekratia/ekratia
+    :alt: Build Status
+.. image:: https://readthedocs.org/projects/ekratia/badge/?version=latest
+   :target: http://ekratia.readthedocs.org/en/latest/?badge=latest
+   :alt: Documentation Status
+
+
+Ekratia is a new way of making democracy. Members of Ekratia use the Internet to vote directly for new ideas and laws. In case they are too busy to vote, members can delegate their vote to other members. Members can change their delegates on real time.
+
+This is the GitHub repository of Ekratia. To learn more about the technical details of the platform, [view the technical readme](technical_readme.rst).
+
+To learn more about Ekratia in general, visit `Ekratia.org <http://www.ekratia.org/>`_
+
+Documentation
+-------------
+
+Find the documentation at:
+
+`http://ekratia.readthedocs.org/en/latest/ <http://ekratia.readthedocs.org/en/latest/>`_
+
+Contributing
+------------
+Found an issue? `Create an issue in Github <https://github.com/ekratia/ekratia/issues>`_
+
+Licensing
+---------
+
+Releases
+--------
+
+0.5.2 November 22/2015
+
+0.6.0 November 23/2015
+
+0.7.0 December 1/2015

config/settings/common.py

@@ -336,7 +336,7 @@
 DJANGO_EMAIL_FROM = '[email protected]'
 DJANGO_EMAIL_ADMIN = '[email protected]'
 
-MANDRILL_API_KEY = env('MANDRILL_API_KEY')
+MANDRILL_API_KEY = env('MANDRILL_API_KEY', default='')
 DEFAULT_FROM_EMAIL = DJANGO_EMAIL_FROM
 DJANGO_EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX',
                                   default='[Ekratia] ')

docs/Makefile

@@ -7,14 +7,19 @@ SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
 
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -25,21 +30,26 @@ help:
 	@echo "  json       to make JSON files"
 	@echo "  htmlhelp   to make HTML files and a HTML help project"
 	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
 	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
 	@echo "  text       to make text files"
 	@echo "  man        to make manual pages"
 	@echo "  texinfo    to make Texinfo files"
 	@echo "  info       to make Texinfo files and run them through makeinfo"
 	@echo "  gettext    to make PO message catalogs"
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
 
 clean:
-	-rm -rf $(BUILDDIR)/*
+	rm -rf $(BUILDDIR)/*
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@@ -77,17 +87,25 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/idekratia.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Ekratia.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/idekratia.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Ekratia.qhc"
+
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/idekratia"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/idekratia"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Ekratia"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Ekratia"
 	@echo "# devhelp"
 
 epub:
@@ -108,6 +126,12 @@ latexpdf:
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
 text:
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
@@ -151,3 +175,18 @@ doctest:
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."