Merge branch 'release/v0.1.0'

crypotex · Oct 12, 2015 · 156fbb4 · 156fbb4
2 parents b1e7783 + 10e4e2d
commit 156fbb4
Show file tree

Hide file tree

Showing 66 changed files with 11,950 additions and 2,295 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/inbox
 /taas.egg-info
 /venv
 /static

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: python
+python:
+- '3.4'
+before_install:
+- sudo apt-get update -qq
+- sudo apt-get install python3-dev
+install:
+- python setup.py install
+script:
+- python setup.py test
diff --git a/README.md b/README.md
@@ -2,11 +2,14 @@
 
 Reservation system for dog agility training ground.
 
+[![Build Status](https://travis-ci.org/crypotex/taas.svg?branch=develop)](https://travis-ci.org/crypotex/taas)
+[![Documentation Status](https://readthedocs.org/projects/taas/badge/?version=latest)](http://taas.readthedocs.org/en/latest/?badge=latest)
+
 ## Authors
-- Andre Tättar
+- Andre Tattar
 - Annika Laumets
 - Viktoria Plemakova
-- Dmitri Tšumak
+- Dmitri Tsumak
 
 ## Developer guidelines
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -41,7 +41,7 @@
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+source_encoding = 'utf-8'
 
 # The master toctree document.
 master_doc = 'index'

diff --git a/docs/customer/mock.rst b/docs/customer/mock.rst
@@ -0,0 +1,5 @@
+Project mock
+============
+
+We have prototyped project UI using mockups and linked requirements to the corresponding UI screens.
+You can access website mock by following this :download:`link <taas_mockup.pdf>`
diff --git a/docs/customer/taas_mockup.pdf b/docs/customer/taas_mockup.pdf
diff --git a/docs/index.rst b/docs/index.rst
@@ -16,6 +16,14 @@ Developing TAAS
    developer/guide
 
 
+Information for customer
+------------------------
+.. toctree::
+   :maxdepth: 1
+
+   customer/mock
+
+
 Indices and tables
 ==================