Commit 354d8469 authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers 🐦

Merge branch 'feature-markdown' into 'master'

Feature markdown

See merge request !10
parents 9e5deb60 b0f55a15
Pipeline #2447 failed with stages
in 3 minutes and 26 seconds
......@@ -16,12 +16,20 @@
]
},
"default": {
"beautifulsoup4": {
"hashes": [
"sha256:5279c36b4b2ec2cb4298d723791467e3000e5384a43ea0cdf5d45207c7e97169",
"sha256:6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931",
"sha256:dcdef580e18a76d54002088602eba453eec38ebbcafafeaabd8cab12b6155d57"
],
"version": "==4.8.1"
},
"certifi": {
"hashes": [
"sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
"sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
"sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50",
"sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
],
"version": "==2019.6.16"
"version": "==2019.9.11"
},
"chardet": {
"hashes": [
......@@ -39,18 +47,18 @@
},
"django": {
"hashes": [
"sha256:16a5d54411599780ac9dfe3b9b38f90f785c51259a584e0b24b6f14a7f69aae8",
"sha256:9a2f98211ab474c710fcdad29c82f30fc14ce9917c7a70c3682162a624de4035"
"sha256:4025317ca01f75fc79250ff7262a06d8ba97cd4f82e93394b2a0a6a4a925caeb",
"sha256:a8ca1033acac9f33995eb2209a6bf18a4681c3e5269a878e9a7e0b7384ed1ca3"
],
"index": "pypi",
"version": "==2.2.4"
"version": "==2.2.6"
},
"django-allauth": {
"hashes": [
"sha256:4444434c2f43188e16e0a7732c3638e12787ca7e5032f69b6d30b2912f53809e"
"sha256:6a189fc4d3ee23596c3fd6e9f49c59b5b15618980118171a50675dd6a27cc589"
],
"index": "pypi",
"version": "==0.39.1"
"version": "==0.40.0"
},
"django-appconf": {
"hashes": [
......@@ -61,18 +69,18 @@
},
"django-bootstrap4": {
"hashes": [
"sha256:9f115534ae8d052d397201f3d716c10d7c9832b422e44dd7382418c6f274df18"
"sha256:3da770392819267eda2f774bcf832460af00db21089b94caf4df94be8a48c48c"
],
"index": "pypi",
"version": "==0.0.8"
"version": "==1.0.1"
},
"django-cors-headers": {
"hashes": [
"sha256:e4b12209b3a0bc577883fe0ac0aa3adac9e82742389f8ddb6c6b41c66b1e9c4f",
"sha256:e69b1c909f2eddc7ef2a24f071583bc22b73b871731ea3370ac52b3318c43b3c"
"sha256:5762ec9c2d59f38c76828dc1d4308baca4bc0d3e1d6f217683e7a24a1c4611a3",
"sha256:ee02f4b699e9b6645602a46d0adb430ee940a1bf8df64f77e516f8d7711fee60"
],
"index": "pypi",
"version": "==3.1.0"
"version": "==3.1.1"
},
"django-fileprovider": {
"hashes": [
......@@ -91,11 +99,11 @@
},
"djangorestframework": {
"hashes": [
"sha256:42979bd5441bb4d8fd69d0f385024a114c3cae7df0f110600b718751250f6929",
"sha256:aedb48010ebfab9651aaab1df5fd3b4848eb4182afc909852a2110c24f89a359"
"sha256:5488aed8f8df5ec1d70f04b2114abc52ae6729748a176c453313834a9ee179c8",
"sha256:dc81cbf9775c6898a580f6f1f387c4777d12bd87abf0f5406018d32ccae71090"
],
"index": "pypi",
"version": "==3.10.2"
"version": "==3.10.3"
},
"idna": {
"hashes": [
......@@ -114,10 +122,10 @@
},
"martor": {
"hashes": [
"sha256:5c42ca1083f4ae6e07431967b0e972c331445b1bb5f1135086473cd8c6efc38c"
"sha256:7b6b51283934b1fb1a782810c892388a0b6253760d88cbdd6e35272e4f506ee6"
],
"index": "pypi",
"version": "==1.4.1"
"version": "==1.4.4"
},
"oauthlib": {
"hashes": [
......@@ -151,10 +159,10 @@
},
"pytz": {
"hashes": [
"sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32",
"sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"
"sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d",
"sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be"
],
"version": "==2019.2"
"version": "==2019.3"
},
"requests": {
"hashes": [
......@@ -172,11 +180,11 @@
},
"sentry-sdk": {
"hashes": [
"sha256:79e8352b5097aa06014871c6daad0933f59d1fcccc586339464ea86e4877b2ab",
"sha256:aeaaf6ae7cc4030d390e5c95797ac1a2a79ac2c8b687709293975ee808c68784"
"sha256:7d8668f082cb1eb9bf1e0d3f8f9bd5796d05d927c1197af226d044ed32b9815f",
"sha256:ff14935cc3053de0650128f124c36f34a4be120b8cc522c149f5cba342c1fd05"
],
"index": "pypi",
"version": "==0.11.1"
"version": "==0.13.0"
},
"six": {
"hashes": [
......@@ -185,6 +193,13 @@
],
"version": "==1.12.0"
},
"soupsieve": {
"hashes": [
"sha256:605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3",
"sha256:b91d676b330a0ebd5b21719cb6e9b57c57d433671f65b9c28dd3461d9a1ed0b6"
],
"version": "==1.9.4"
},
"sqlparse": {
"hashes": [
"sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177",
......@@ -194,20 +209,20 @@
},
"urllib3": {
"hashes": [
"sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1",
"sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232"
"sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398",
"sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86"
],
"version": "==1.25.3"
"version": "==1.25.6"
}
},
"develop": {
"django": {
"hashes": [
"sha256:16a5d54411599780ac9dfe3b9b38f90f785c51259a584e0b24b6f14a7f69aae8",
"sha256:9a2f98211ab474c710fcdad29c82f30fc14ce9917c7a70c3682162a624de4035"
"sha256:4025317ca01f75fc79250ff7262a06d8ba97cd4f82e93394b2a0a6a4a925caeb",
"sha256:a8ca1033acac9f33995eb2209a6bf18a4681c3e5269a878e9a7e0b7384ed1ca3"
],
"index": "pypi",
"version": "==2.2.4"
"version": "==2.2.6"
},
"django-debug-toolbar": {
"hashes": [
......@@ -219,10 +234,10 @@
},
"pytz": {
"hashes": [
"sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32",
"sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"
"sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d",
"sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be"
],
"version": "==2019.2"
"version": "==2019.3"
},
"sqlparse": {
"hashes": [
......
{% extends "base.html" %}
{% load static bootstrap4 %}
{% load static bootstrap4 martortags %}
{% load account socialaccount %}
{% block head_title %}Competitions{% endblock %}
......@@ -27,7 +27,7 @@
<div class="border rounded p-3 my-3">
<h3><a href="{{track.get_absolute_url}}">{{track}}</a></h3>
<p class="lead">{{track.competition}}</p>
<p>{{track.description}}</p>
<p>{{track.description|safe_markdown}}</p>
</div>
{% empty %}
No open tracks
......
{% extends "fg_competitions/base_track.html" %}
{% load account %}
{% load account martortags %}
{% block head_title %}{{track}}{% endblock %}
{% block content_tab %}
<h2 class="sr-only">Details</h2>
<p class="lead">{{track.description}}</p>
<p class="lead">{{track.description|safe_markdown}}</p>
{% if track.owner %}
<p> Run by <a href="{{track.owner.get_absolute_url}}">{{track.owner}}</a></p>
......
{% extends "base.html" %}
{% load extra_utils %}
{% load extra_utils martortags %}
{% block head_title %}Competitions{% endblock %}
......@@ -32,7 +32,7 @@
<div class="card-body">
<h3 class="card-title"><a href="{{track.get_absolute_url}}">{{track}}</a></h3>
<h4 class="card-subtitle mb-2 text-muted">{{track.competition}}</h4>
<p class="card-text">{{track.description|default:""}}</p>
<p class="card-text">{{track.description|default:""|safe_markdown}}</p>
</div>
<div class="card-footer">
<div class="d-flex" style="text-algin: center">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment