Commit Graph

180 Commits

Author SHA1 Message Date
Luke M
f8eec7299b Merge branch 'enable-basic-ci' into 'master'
Install a basic pytest CI

See merge request autonomic-cooperative/ojuso-map!2
2018-04-12 19:19:47 +00:00
Luke Murphy
314a32eed6
Get a basic pytest CI in there. 2018-04-12 21:15:24 +02:00
Carl van Tonder
4eae888d14 Remove jenkins 2018-04-10 14:33:07 -04:00
Carl van Tonder
8f544992cd Make project_owners & shareholders required..
..and tweak "country" label text
2018-04-04 18:26:34 -04:00
Carl van Tonder
316f2cb78a Make power grid / energy storage Qs optional
approximate_total_investment & contractor_or_supplier_of_technology
should both be optional for non-"power grid / energy storage" types
2018-04-04 18:15:51 -04:00
Carl van Tonder
490e6706d9 Revert "Autocomplete from GIS list of CRSs.."
This reverts commit dce53630f7.
2018-04-04 18:02:33 -04:00
Carl van Tonder
0954be4a80 Change production logging configuration:
- disable "Invalid HTTP_HOST" messages
 - separate error emails (rely on Sentry)
2018-04-04 15:28:19 -04:00
Carl van Tonder
dce53630f7 Autocomplete from GIS list of CRSs..
..using django-autocomplete-light, in both the admin area and the
end-user form

Closes #32
2018-04-04 15:28:08 -04:00
Carl van Tonder
a50c40e739 Configurable database email, local Mailgun sandbox 2018-04-04 13:36:27 -04:00
Carl van Tonder
f19f501684 Make sure showing/hiding works on page load
Fixes #53
2018-04-04 13:12:00 -04:00
Carl van Tonder
6add9a10aa Fix page title on case study form page 2018-04-04 13:07:09 -04:00
Carl van Tonder
0a3b10340c Update locale files for Weblate 2018-04-04 12:54:58 -04:00
Weblate
06b5a6d290 Merge remote-tracking branch 'origin/master' 2018-04-04 16:41:40 +00:00
Weblate
0c54a58e88 Merge remote-tracking branch 'origin/master' 2018-04-04 04:33:59 +00:00
Ximena Montaño
91479feb26 Translated using Weblate (Spanish)
Currently translated at 88.0% (140 of 159 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/es/
2018-04-04 04:32:52 +00:00
Emilie Heidtmann
1d6e1f78f6 Translated using Weblate (French)
Currently translated at 100.0% (159 of 159 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/fr/
2018-04-04 04:32:51 +00:00
Emilie Heidtmann
6b681542d4 Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (159 of 159 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-04-04 04:32:51 +00:00
Carl van Tonder
ef54317bea Use MailGun via django-anymail instead of Gandi 2018-04-03 17:46:04 -04:00
f4a7a108b5 Add a basic email on case study submission. Closes #50. 2018-04-02 23:02:49 +10:00
1847b22c09 f 2018-04-02 22:38:09 +10:00
dbdab0e440 Make type of ecosystem field long enough to hold all choices 2018-04-02 22:36:46 +10:00
50b5f67bab Add extra text in 3.1.1. Closes #29. 2018-04-02 19:59:37 +10:00
e4f4a5e73b Add non-indigenous people list, as per client request 2018-03-31 22:38:30 +11:00
9ab6366d37 Prettify map pin popups. Closes #18. 2018-03-31 22:12:06 +11:00
ee440617d9 Delete trailing spaces and rogue newlines 2018-03-31 21:05:09 +11:00
fafb475869 Fiddle with form layout a bit to add coherence 2018-03-31 21:00:43 +11:00
b2266600de Add banks list. Closes #23. 2018-03-31 21:00:43 +11:00
9438ca07cb Fix case study view after adding Vimeo support (5f2941d2) 2018-03-31 21:00:34 +11:00
a5011674f8 Fix type of ecosystem field after messing it up in 9d5daf4e. 2018-03-31 17:23:22 +11:00
5f2941d205 Allow Vimeo as well as YouTube URLs. Closes #26. 2018-03-31 17:18:35 +11:00
0f0f78bd24 Fix wording of 4.4. Closes #33 2018-03-31 16:33:35 +11:00
4147dc7d32 Add contact fields. Closes #30. 2018-03-31 16:29:25 +11:00
5bf1855974 Add migration script for previous two changes (clsoes #48) 2018-03-29 21:51:13 +11:00
83ae33ca9c Fix units on 2.2.2 (#48) 2018-03-29 21:51:06 +11:00
9d5daf4e13 Make changes Tom suggested via email 2018-03-29 21:51:06 +11:00
Carl van Tonder
f549458412 Don't run collectstatic for every. single. change 2018-03-29 01:21:54 -04:00
Carl van Tonder
002090d1af Switch to Autonomic Sentry account 2018-03-28 13:29:04 -04:00
a70da01edf Prettyify password reset form 2018-03-28 22:46:00 +11:00
5339eef30d Provide a default for shown_on_other_platforms now it's now nullable 2018-03-28 22:34:36 +11:00
6e8b47d350 Add a submit button to express form (closes #39) 2018-03-28 22:34:27 +11:00
03cc89346f Redirect complete forms to acknowledgement of receipt (closes #40) 2018-03-28 22:34:18 +11:00
204f5dca71 Fix conditional validation from 946ec52119 2018-03-28 18:15:09 +11:00
8b0f2f9dee Complete showing all data on case study view, closes #7 2018-03-28 17:28:57 +11:00
b8eecb0660 Fix bugs in model 2018-03-28 17:26:40 +11:00
31cba9f4b9 Add logic+tests for handling display of type of renewable generation (#7) 2018-03-28 13:24:43 +11:00
946ec52119 Fix 1.2.1 to be a single choice instead of three (#43) 2018-03-28 13:21:18 +11:00
b7f2be8b3e Display most of §1 of the spec (#7) 2018-03-27 17:42:18 +11:00
cb21daca5b Allow more fields in the case study to be blank 2018-03-27 17:42:18 +11:00
d80ed6a015 Remove cache from local.yml 2018-03-27 17:42:18 +11:00
6a6260c183 Expose local postgres so you can connect to it when using docker-machine 2018-03-27 15:31:36 +11:00