Skip to content

Commit 40f3ca1

Browse files
committed
Merge branch 'master' into taiga-6
2 parents 4ed7b11 + 03f5ecf commit 40f3ca1

File tree

5 files changed

+9
-41
lines changed

5 files changed

+9
-41
lines changed

importers.adoc

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:source-highlighter: pygments
55
:pygments-style: friendly
66

7-
You can configure importers for Jira, Github, Asana and Trello in your own instance.
7+
You can configure importers for Jira, Github and Trello in your own instance.
88

99
== Trello
1010

@@ -59,37 +59,6 @@ And you have to enable in your dist/conf.json in taiga-front adding it to import
5959
}
6060
----
6161

62-
== Asana
63-
64-
For configure Asana, you have to go to your asana account settings, in Apps
65-
section, and click on "Manage Developer Apps", then you have to "Add new
66-
application", ensure that the callback url match with your settings, and the
67-
url of your service with the path /project/new/import/asana.
68-
After that, you can get your client id and your client secret and configure it
69-
in your settings/config.py:
70-
71-
[source,python]
72-
----
73-
IMPORTERS["asana"] = {
74-
"active": True,
75-
"callback_url": "{}://{}/project/new/import/asana".format(SITES["front"]["scheme"],
76-
SITES["front"]["domain"]),
77-
"app_id": "your-asana-client-id",
78-
"app_secret": "your-asana-client-secret"
79-
}
80-
----
81-
82-
And you have to enable in your dist/conf.json in taiga-front adding it to importers list:
83-
84-
[source,js]
85-
----
86-
{
87-
...
88-
importers: ["asana", ...]
89-
...
90-
}
91-
----
92-
9362
== Jira
9463

9564
=== Important notice about Jira releases and Taiga compatibility
@@ -117,8 +86,8 @@ settings/config.py:
11786
IMPORTERS["jira"] = {
11887
"active": True,
11988
"consumer_key": "one-key-at-your-election",
120-
"cert": file('private_key.pem').read(), # You can directly copy and paste the content here
121-
"pub_cert": file('public_key.pem').read(), # You can directly copy and paste the content here
89+
"cert": open('private_key.pem').read(), # You can directly copy and paste the content here
90+
"pub_cert": open('public_key.pem').read(), # You can directly copy and paste the content here
12291
}
12392
----
12493

index.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Free. Open Source. Powerful. _Taiga_ is a project management platform for startu
66
and agile developers & designers who want a simple, beautiful tool that makes work
77
truly enjoyable.
88

9-
109
[[installation-guide]]
1110
== Installation Guide
1211

setup-development.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This section helps with the download and configuration of the backend (api) Taig
3030

3131
=== Install dependencies
3232

33-
The backend is written mainly in python (3.5) but for some third party libraries we need to install a
33+
The backend is written mainly in python (3.6) but for some third party libraries we need to install a
3434
C compiler and development headers.
3535

3636
[source,bash]
@@ -64,7 +64,7 @@ sudo service postgresql reload
6464

6565
=== Setup python environment
6666

67-
To run **taiga-back** you should have python (>=3.5) installed along with some other third party
67+
To run **taiga-back** you should have python (>=3.6) installed along with some other third party
6868
libraries. As a first step, start installing python:
6969

7070
[source,bash]
@@ -190,8 +190,8 @@ python -m celery -A taiga worker -l info -E
190190
Debian stable (Jessie) provides all needed requirements, but old-stable (Wheezy) does not.
191191

192192
The latest Python available from Wheezy's apt repositories is only 3.1 and insufficient for taiga-back.
193-
Python 3.5 is available from stable (Jessie) if you are comfortable using mixed versions in your apt sources.
194-
Otherwise, you must build Python 3.5 from source (see https://www.python.org/downloads/source/ for links).
193+
Python 3.6 is available from stable (Jessie) if you are comfortable using mixed versions in your apt sources.
194+
Otherwise, you must build Python 3.6 from source (see https://www.python.org/downloads/source/ for links).
195195
When building from source, if the bz2 development libraries are not already present on your system, then you must first:
196196
[source,bash]
197197
----

setup-faqs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,4 @@ export LC_ALL=en_US.UTF-8
173173
export LC_TYPE=en_US.UTF-8
174174
----
175175

176-
Restart the shell, or the machine, and try again.
176+
Restart the shell, or the machine, and try again.

upgrades-older.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Rebuild your virtualenv
199199
[source, txt]
200200
----
201201
$ rmvirtualenv taiga
202-
$ mkvirtualenv taiga -p /usr/bin/python3.5
202+
$ mkvirtualenv taiga -p /usr/bin/python3.6
203203
$ cd ~/taiga-back
204204
$ pip install -r requirements.txt
205205
----

0 commit comments

Comments
 (0)