Commit Graph

426 Commits

Author SHA1 Message Date
b42a9c7571 Fix failing test 2018-09-23 13:50:38 +01:00
Weblate
0bbc822e74 Merge remote-tracking branch 'origin/master' 2018-09-23 12:09:45 +00:00
47236ac547 Try again 2018-09-23 12:09:42 +00:00
Weblate
d97347631f Merge remote-tracking branch 'origin/master' 2018-09-23 11:58:12 +00:00
d0a4148b13 Try to fix tests again 2018-09-23 11:58:09 +00:00
Weblate
db1d48631f Merge remote-tracking branch 'origin/master' 2018-09-23 02:48:22 +00:00
Carl van Tonder
ea245cc4fc Update docs, add example .env file
virtualenvwrapper guide, merge / tidy up database installation
instructions
2018-09-22 22:47:35 -04:00
Carl van Tonder
775f6982d1 Ignore static dir in git 2018-09-22 22:47:18 -04:00
Weblate
7d2e9a27af Merge remote-tracking branch 'origin/master' 2018-09-23 02:25:55 +00:00
Carl van Tonder
af9f522bef Fix test failure 2018-09-22 22:25:35 -04:00
Carl van Tonder
ab57602a5f Fix crashing test 2018-09-22 22:25:35 -04:00
Weblate
9bfa47ecfe Merge remote-tracking branch 'origin/master' 2018-09-22 18:09:21 +00:00
ff445e166d Text fields shouldn't have null=True. (#94) 2018-09-22 19:09:05 +01:00
3a17029dbd Upgrade to Django 1.11 compatible version of django-cas-server 2018-09-22 18:10:53 +01:00
Weblate
f42f4131b8 Merge remote-tracking branch 'origin/master' 2018-09-20 12:00:28 +00:00
Naomi
a467062fe1 Form now jumps to first error (if any) when it reloads
even if on a different tab.
2018-09-20 12:59:47 +01:00
Naomi
e4a9df0e00 Updated documentation and system requirements 2018-09-10 17:23:40 +01:00
Weblate
63a47bffb0 Merge remote-tracking branch 'origin/master' 2018-09-05 15:36:49 +00:00
Carl van Tonder
ffeed9bf94 Add Fedora postgres set-up instructions 2018-09-05 11:35:07 -04:00
Weblate
499a54445f Merge remote-tracking branch 'origin/master' 2018-09-05 15:33:36 +00:00
Carl van Tonder
81229f9a6e Update setup instructions 2018-09-05 11:33:25 -04:00
Weblate
587a4126fa Merge remote-tracking branch 'origin/master' 2018-09-05 13:11:35 +00:00
Naomi
39c35175b9 Updated installation instructions for debian 2018-09-05 14:10:57 +01:00
Weblate
67d08d2bb9 Merge remote-tracking branch 'origin/master' 2018-06-28 11:39:28 +00:00
9b1d9e7e04 Update draft deletion logic for new field
And comment the delete-files-only-in-drafts logic.
2018-06-27 19:50:24 +01:00
Weblate
1acbd07113 Merge remote-tracking branch 'origin/master' 2018-06-27 18:44:22 +00:00
a4072ba22a Tweak failing test
I've worked out this test is failing when FileDeleteView::post() calls
self.get_object() - that's when the 404 is being sent.  I can't work out
why though, because everything else looks fine.
2018-06-27 19:43:39 +01:00
a964ee03d2 Add test bucket when testing, so we can nuke debug files 2018-06-27 19:30:25 +01:00
Carl van Tonder
7591f35483 Include selenium in requirements 2018-06-20 00:10:32 -04:00
Carl van Tonder
07193c5ba2 Add initial selenium tests 2018-06-20 00:10:02 -04:00
Carl van Tonder
00b3e1a476 Fix collapsing nav bar
Closes #75
2018-06-19 23:18:08 -04:00
Weblate
21de4ce797 Merge remote-tracking branch 'origin/master' 2018-06-18 19:28:49 +00:00
Carl van Tonder
c1e8762287 Avoid JS map crash on missing images 2018-06-18 15:28:38 -04:00
Weblate
fbab408bf9 Merge remote-tracking branch 'origin/master' 2018-06-06 14:57:15 +00:00
4c71ba7a25 Update .gitlab-ci.yml 2018-06-06 14:57:11 +00:00
Weblate
1bd4987ed0 Merge remote-tracking branch 'origin/master' 2018-05-30 18:23:36 +00:00
Carl van Tonder
c32ddf1abb Fix CaseStudy serialisation..
..by ensuring CS images are serialised correctly
2018-05-30 14:21:48 -04:00
Weblate
99a3eb47b8 Merge remote-tracking branch 'origin/master' 2018-05-30 03:17:04 +00:00
Carl van Tonder
2bb7ea5561 Set CaseStudy.author 2018-05-29 23:16:51 -04:00
Carl van Tonder
d80f933b7b Add CaseStudyDraft.created 2018-05-29 23:16:51 -04:00
Carl van Tonder
39949562c1 Use multi-file upload for "images" field
Closes #62
2018-05-29 23:16:51 -04:00
Weblate
7998fd5a35 Merge remote-tracking branch 'origin/master' 2018-05-26 15:38:19 +00:00
Carl van Tonder
8a8eccaeaa Make "land ownership details" visible always
Closes #71
2018-05-26 11:36:44 -04:00
Tom (ojuso)
9e0dca6831 Translated using Weblate (English (United Kingdom))
Currently translated at 99.7% (370 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-26 06:54:03 +00:00
Tom (ojuso)
8afc54c94c Translated using Weblate (English (United Kingdom))
Currently translated at 99.7% (370 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-25 17:19:01 +00:00
Tom (ojuso)
780db73565 Translated using Weblate (English (United Kingdom))
Currently translated at 99.7% (370 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-25 17:13:43 +00:00
Emilie Heidtmann
d11ffdf09d Translated using Weblate (English (United Kingdom))
Currently translated at 99.7% (370 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-25 17:13:42 +00:00
Weblate Admin
4d74acc0d7 Translated using Weblate (English (United Kingdom))
Currently translated at 99.7% (370 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-25 17:13:42 +00:00
Tom (ojuso)
50522b8add Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (371 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-25 16:42:25 +00:00
Tom (ojuso)
0613711336 Translated using Weblate (English (United Kingdom))
Currently translated at 85.4% (317 of 371 strings)

Translation: Ojuso Platform/Map
Translate-URL: http://translate.ojuso.org/projects/platform/map/en_GB/
2018-05-25 16:11:07 +00:00