Merge branch 'master' into stable

.gitignore

@@ -3,6 +3,7 @@
 *.log
 taiga/search
 settings/local.py
+settings/celery_local.py
 database.sqlite
 logs
 media

.travis.yml

@@ -2,15 +2,17 @@ language: python
 python:
   - "3.4"
   - "3.5"
+addons:
+  postgresql: "9.4"
 services:
-  - rabbitmq # will start rabbitmq-server
+  - rabbitmq
+  - postgresql
 cache:
   - apt
   - pip
 before_install:
   - sudo apt-get -qq update
   - sudo /etc/init.d/postgresql stop
-  - sudo apt-get install -y postgresql-9.4
   - sudo apt-get install -y postgresql-plpython-9.4
   - sudo /etc/init.d/postgresql start 9.4
   - psql -c 'create database taiga;' -U postgres

CHANGELOG.md

@@ -1,6 +1,35 @@
 # Changelog #
 
 
+## 3.1.0 Perovskia Atriplicifolia (2017-03-10)
+
+### Features
+- Contact with the project: if the projects have this module enabled Taiga users can contact them.
+- Ability to create rich text custom fields in Epics, User Stories, Tasks and Isues.
+- Full text search now use simple as tokenizer so search with non-english text are allowed.
+- Duplicate project: allows creating a new project based on the structure of another (status, tags, colors, default values...)
+- Add thumbnails and preview for PSD files.
+- Add thumbnails and preview for SVG files (Cario lib is needed).
+- i18n:
+  - Add japanese (ja) translation.
+  - Add korean (ko) translation.
+  - Add chinese simplified (zh-Hans) translation.
+- Third party services project importers:
+  - Trello
+  - Jira 7
+  - Github
+  - Asana
+
+### Misc
+- API:
+    - Memberships API endpoints now allows using usernames and emails instead of using only emails.
+    - Contacts API allow full text search (by the username, full name or email).
+    - Filter milestones, user stories and tasks by estimated_start and estimated_finish dates.
+    - Add project_extra_info to epics, tasks, milestones, issues and wiki pages endpoints.
+- Gogs integration: Adding new Gogs signature method.
+- Lots of small and not so small bugfixes.
+
+
 ## 3.0.0 Stellaria Borealis (2016-10-02)
 
 ### Features

ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+**Before adding an issue**
+Please ensure that your issue is not already reported in our [issues list](https://tree.taiga.io/project/taiga/issues?order_by=-created_date).
+If this issue was already reported, remember that you can upvote it to raise its importance.
+
+**Do you want to request a *feature* or report a *bug*?**
+
+**What is the current behavior?**
+
+**If the current behavior is a bug, please provide the steps to reproduce.**
+
+**What is the expected behavior?**
+
+**Is it happening in taiga.io or in your own instance?**
+
+**What browser/version are you using?**
+
+**Are there any console errors *(Ctrl + F12)* in red?**
+
+Thanks for reporting!

README.md

@@ -1,10 +1,9 @@
 # Taiga Backend #
 
-![Kaleidos Project](http://kaleidos.net/static/img/badge.png "Kaleidos Project")
-[![Managed with Taiga.io](https://taiga.io/media/support/attachments/article-22/banner-gh.png)](https://taiga.io "Managed with Taiga.io")
-[![Build Status](https://travis-ci.org/taigaio/taiga-back.svg?branch=master)](https://travis-ci.org/taigaio/taiga-back "Build Status")
-[![Coverage Status](https://coveralls.io/repos/taigaio/taiga-back/badge.svg?branch=master)](https://coveralls.io/r/taigaio/taiga-back?branch=master "Coverage Status")
-[![Dependency Status](https://www.versioneye.com/user/projects/561bd091a193340f32001464/badge.svg?style=flat)](https://www.versioneye.com/user/projects/561bd091a193340f32001464)
+![Kaleidos Project](http://kaleidos.net/static/img/badge.svg "Kaleidos Project")
+[![Managed with Taiga.io](https://img.shields.io/badge/managed%20with-TAIGA.io-709f14.svg)](https://tree.taiga.io/project/taiga/ "Managed with Taiga.io")
+[![Build Status](https://img.shields.io/travis/taigaio/taiga-back.svg)](https://travis-ci.org/taigaio/taiga-back "Build Status")
+[![Coverage Status](https://img.shields.io/coveralls/taigaio/taiga-back/master.svg)](https://coveralls.io/r/taigaio/taiga-back?branch=master "Coverage Status")
 
 
 ## Contribute to Taiga ##
@@ -64,7 +63,7 @@ Currently, we have authored three main documentation hubs:
 
 #### Translation ####
 
-We are ready now to accept your help translating Taiga. It's easy (and fun!) just access our team of translators with the link below, set up an account in Transifex and start contributing. Join us to make sure your language is covered! **[Help Taiga to translate content](https://www.transifex.com/signup/ "Help Taiga to trasnlatecontent")**
+We are ready now to accept your help translating Taiga. It's easy (and fun!) just access our team of translators with the link below, set up an account in Transifex and start contributing. Join us to make sure your language is covered! **[Help Taiga to translate content](https://www.transifex.com/taiga-agile-llc/taiga-back/ "Help Taiga to trasnlatecontent")**
 
 
 #### Code patches ####
@@ -80,7 +79,7 @@ Taiga is made for developers and designers. We care enormously about UI because
 
 There are two possible ways to contribute to our UI:
 - **Bugs**: If you find a bug regarding front-end, please report it as previously indicated in the Bug reports section or send a pull-request as indicated in the Code Patches section.
-- **Enhancements**: If its a design or UX bug or enhancement we will love to receive your feedback. Please send us your enhancement, with the reason and, if possible, an example. Our design and UX team will review your enhancement and fix it as soon as possible. We recommend you to use our [mailing list](http://groups.google.co.uk/d/forum/taigaio){target="_blank"} so we can have a lot of different opinions and debate.
+- **Enhancements**: If its a design or UX bug or enhancement we will love to receive your feedback. Please send us your enhancement, with the reason and, if possible, an example. Our design and UX team will review your enhancement and fix it as soon as possible. We recommend you to use our [mailing list](http://groups.google.co.uk/d/forum/taigaio) so we can have a lot of different opinions and debate.
 - **Language Localization**: We are eager to offer localized versions of Taiga. Some members of the community have already volunteered to work to provide a variety of languages. We are working to implement some changes to allow for this and expect to accept these requests in the near future.
 
 

manage.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2014-2016 Andrey Antukh <niwi@niwi.nz>
-# Copyright (C) 2014-2016 Jesús Espino <jespinog@gmail.com>
-# Copyright (C) 2014-2016 David Barragán <bameda@dbarragan.com>
-# Copyright (C) 2014-2016 Alejandro Alonso <alejandro.alonso@kaleidos.net>
+# Copyright (C) 2014-2017 Andrey Antukh <niwi@niwi.nz>
+# Copyright (C) 2014-2017 Jesús Espino <jespinog@gmail.com>
+# Copyright (C) 2014-2017 David Barragán <bameda@dbarragan.com>
+# Copyright (C) 2014-2017 Alejandro Alonso <alejandro.alonso@kaleidos.net>
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the

requirements-devel.txt

@@ -1,13 +1,13 @@
 -r requirements.txt
 
 factory_boy==2.8.1
-py==1.4.31
-pytest==2.8.7
-pytest-django==2.9.1
-pytest-pythonpath==0.7
+py==1.4.32
+pytest==3.0.6
+pytest-django==3.1.2
+pytest-pythonpath==0.7.1
 
-coverage==4.0.3
+coverage==4.3.4
 coveralls==1.1
 django-slowdown==0.0.1
 
-transifex-client==0.11.1.beta
+transifex-client==0.12.4

requirements.txt

@@ -1,38 +1,42 @@
-Django==1.9.2
+Django==1.10.6
 #djangorestframework==2.3.13    # It's not necessary since Taiga 1.7
 django-picklefield==0.3.2
-django-sampledatahelper==0.4.0
-gunicorn==19.4.5
-psycopg2==2.6.1
-Pillow==3.1.1
-pytz==2015.7
+django-sampledatahelper==0.4.1
+gunicorn==19.6.0
+psycopg2==2.7
+Pillow==3.4.2
+pytz==2016.10
 six==1.10.0
-amqp==1.4.9
-djmail==0.12.0.post1
-django-pgjson==0.3.1
-djorm-pgarray==1.2              # Use until Taiga 2.1. Keep compatibility with old migrations
-django-jinja==2.1.2
-jinja2==2.8
-pygments==2.0.2
+amqp==2.1.4
+djmail==1.0.0
+django-jinja==2.2.2
+jinja2==2.9.5
+pygments==2.2.0
 django-sites==0.9
-Markdown==2.6.5
+Markdown==2.6.8
 fn==0.4.3
 diff-match-patch==20121119
-requests==2.9.1
+requests==2.13.0
+requests-oauthlib==0.8.0
+webcolors==1.7
 django-sr==0.0.4
 easy-thumbnails==2.3
-celery==3.1.20
+celery==4.0.2
 redis==2.10.5
-Unidecode==0.04.19
-raven==5.10.2
-bleach==1.4.3
-django-ipware==1.1.3
-premailer==2.9.7
+Unidecode==0.4.20
+raven==6.0.0
+bleach==1.5.0
+django-ipware==1.1.6
+premailer==3.0.1
 cssutils==1.0.1                 # Compatible with python 3.5
-lxml==3.5.0
-git+https://github.com/Xof/django-pglocks.git@dbb8d7375066859f897604132bd437832d2014ea
-pyjwkest==1.1.5
-python-dateutil==2.4.2
-netaddr==0.7.18
+lxml==3.7.3
+git+https://github.com/Xof/django-pglocks.git
+pyjwkest==1.3.2
+python-dateutil==2.6.0
+netaddr==0.7.19
 serpy==0.1.1
 psd-tools==1.4
+CairoSVG==2.0.1
+cryptography==1.7.1
+PyJWT==1.4.2
+asana==0.6.2

scripts/manage_translations.py

@@ -246,7 +246,7 @@ def commit(resources=None, languages=None):
 
     or
 
-       $ pip install --upgrade transifex-client==0.11.1.beta
+       $ pip install --upgrade transifex-client==0.12.2
 
  2. Create ~/.transifexrc file:
 

settings/__init__.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2016 Andrey Antukh <niwi@niwi.nz>
-# Copyright (C) 2014-2016 Jesús Espino <jespinog@gmail.com>
-# Copyright (C) 2014-2016 David Barragán <bameda@dbarragan.com>
-# Copyright (C) 2014-2016 Alejandro Alonso <alejandro.alonso@kaleidos.net>
+# Copyright (C) 2014-2017 Andrey Antukh <niwi@niwi.nz>
+# Copyright (C) 2014-2017 Jesús Espino <jespinog@gmail.com>
+# Copyright (C) 2014-2017 David Barragán <bameda@dbarragan.com>
+# Copyright (C) 2014-2017 Alejandro Alonso <alejandro.alonso@kaleidos.net>
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the

settings/celery.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2016 Andrey Antukh <niwi@niwi.nz>
-# Copyright (C) 2014-2016 Jesús Espino <jespinog@gmail.com>
-# Copyright (C) 2014-2016 David Barragán <bameda@dbarragan.com>
-# Copyright (C) 2014-2016 Alejandro Alonso <alejandro.alonso@kaleidos.net>
+# Copyright (C) 2014-2017 Andrey Antukh <niwi@niwi.nz>
+# Copyright (C) 2014-2017 Jesús Espino <jespinog@gmail.com>
+# Copyright (C) 2014-2017 David Barragán <bameda@dbarragan.com>
+# Copyright (C) 2014-2017 Alejandro Alonso <alejandro.alonso@kaleidos.net>
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
@@ -16,19 +16,22 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from kombu import Exchange, Queue
+from kombu import Queue
 
-BROKER_URL = 'amqp://guest:guest@localhost:5672//'
-CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
+broker_url = 'amqp://guest:guest@localhost:5672//'
+result_backend = 'redis://localhost:6379/0'
 
-CELERY_TIMEZONE = 'Europe/Madrid'
-CELERY_ENABLE_UTC = True
+accept_content = ['pickle',] # Values are 'pickle', 'json', 'msgpack' and 'yaml'
+task_serializer = "pickle"
+result_serializer = "pickle"
 
-CELERY_DEFAULT_QUEUE = 'tasks'
-CELERY_QUEUES = (
+timezone = 'Europe/Madrid'
+
+task_default_queue = 'tasks'
+task_queues = (
     Queue('tasks', routing_key='task.#'),
     Queue('transient', routing_key='transient.#', delivery_mode=1)
 )
-CELERY_DEFAULT_EXCHANGE = 'tasks'
-CELERY_DEFAULT_EXCHANGE_TYPE = 'topic'
-CELERY_DEFAULT_ROUTING_KEY = 'task.default'
+task_default_exchange = 'tasks'
+task_default_exchange_type = 'topic'
+task_default_routing_key = 'task.default'

settings/celery_local.py.example

@@ -0,0 +1,4 @@
+from .celery import *
+
+# To use celery in memory
+#task_always_eager = True