diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec9f0818..e0a97126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,9 @@ k8s-prod-deploy: when: manual only: - master + environment: + name: prod + url: https://rego.linux.conf.au build_ticket_image: image: docker:git @@ -59,6 +62,9 @@ k8s-ticket-testing-deploy: when: manual only: - ticket-testing + environment: + name: staging + url: https://ticket-testing.lca2018.org pages: image: alpine @@ -74,3 +80,6 @@ pages: - public only: - master + environment: + name: docs + url: https://lca2018.gitlab.io/symposion_app/ diff --git a/fixtures/miniconf-fixtures/symposion_proposals.json b/fixtures/miniconf-fixtures/symposion_proposals.json index e54c63d1..d0c06497 100644 --- a/fixtures/miniconf-fixtures/symposion_proposals.json +++ b/fixtures/miniconf-fixtures/symposion_proposals.json @@ -5,7 +5,7 @@ "end": "2017-11-30T12:59:00Z", "published": false, "section": 3, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 3 @@ -16,7 +16,7 @@ "end": "2017-11-30T12:59:00Z", "published": false, "section": 4, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 4 @@ -27,7 +27,7 @@ "end": "2017-11-30T12:59:00Z", "published": false, "section": 5, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 5 @@ -38,7 +38,7 @@ "end": "2017-11-30T12:59:00Z", "published": false, "section": 6, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 6 @@ -49,7 +49,7 @@ "end": "2017-11-29T13:01:00Z", "published": false, "section": 7, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 7 @@ -57,10 +57,9 @@ { "fields": { "closed": false, - "end": "2017-11-29T13:01:00Z", "published": false, "section": 8, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-12T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 8 @@ -68,10 +67,10 @@ { "fields": { "closed": false, - "end": "2017-11-29T13:01:00Z", + "end": "2017-11-27T13:01:00Z", "published": false, "section": 9, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-12T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 9 @@ -82,7 +81,7 @@ "end": "2017-11-29T13:01:00Z", "published": false, "section": 10, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 10 @@ -93,7 +92,7 @@ "end": "2017-11-29T13:01:00Z", "published": false, "section": 11, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 11 @@ -104,7 +103,7 @@ "end": "2017-11-29T13:01:00Z", "published": false, "section": 12, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 12 @@ -115,7 +114,7 @@ "end": "2017-11-29T13:01:00Z", "published": false, "section": 13, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 13 @@ -126,7 +125,7 @@ "end": "2017-11-29T13:01:00Z", "published": false, "section": 14, - "start": "2017-11-01T14:01:00Z" + "start": "2017-10-15T14:01:00Z" }, "model": "symposion_proposals.proposalsection", "pk": 14 diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 841b0a01..d1214fc1 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -306,33 +306,34 @@ {% endif %} -
{{ team.description }}
{% endif %} - {{ team.get_access_display }} - Details -{{ team.description }}
{% endif %} + {{ team.get_access_display }} + Details +