|
|
e9f9b6f20d
|
Get docker working with new assets folder
|
2018-10-12 21:25:12 -04:00 |
|
Weblate
|
c9412bc885
|
Merge remote-tracking branch 'origin/master'
|
2018-10-13 00:29:37 +00:00 |
|
|
|
ac9090788a
|
Comment out non-working point of interest link
|
2018-10-12 20:29:31 -04:00 |
|
Weblate
|
185a2a5d13
|
Merge remote-tracking branch 'origin/master'
|
2018-10-13 00:25:28 +00:00 |
|
|
|
b5cc53acf9
|
Add scaled-down navicon
|
2018-10-12 20:25:14 -04:00 |
|
|
|
cca364d308
|
Move more shared CSS into the shared CSS file
|
2018-10-12 20:08:06 -04:00 |
|
|
|
a784ddad4f
|
Move some utility classes into a shared location
|
2018-10-12 20:00:55 -04:00 |
|
|
|
b0aea72c12
|
Redesign form selector screen
|
2018-10-12 19:51:59 -04:00 |
|
|
|
c21a06d5c8
|
Get basic, admin-editable POI working
|
2018-10-12 18:56:27 -04:00 |
|
Weblate
|
69afdab299
|
Merge remote-tracking branch 'origin/master'
|
2018-10-12 22:50:58 +00:00 |
|
|
|
4dc3acb1f9
|
Move some things around in prep for more than one form
|
2018-10-12 18:50:51 -04:00 |
|
|
|
69e518240c
|
Add point of interest model
|
2018-10-12 18:50:27 -04:00 |
|
Weblate
|
df92ae3c05
|
Merge remote-tracking branch 'origin/master'
|
2018-10-12 22:35:21 +00:00 |
|
|
|
79dffadd14
|
Restore names of uploaded files on submit/draft restore (#65)
This involved turning the list of file IDs stored in the hidden
text field into JSON.
|
2018-10-12 18:34:39 -04:00 |
|
|
|
b5ccbf631d
|
Fix bug where you couldn't upload files with spaces in the name
As part of this, replace to the jquery-file-upload plugin with a simple
fetch() call.
|
2018-10-12 18:31:20 -04:00 |
|
Weblate
|
ad5acf91a9
|
Merge remote-tracking branch 'origin/master'
|
2018-10-10 01:23:13 +00:00 |
|
|
|
579bb73574
|
Add script to get into postgres on production
|
2018-10-09 21:23:12 -04:00 |
|
Weblate
|
7c642e27c9
|
Merge remote-tracking branch 'origin/master'
|
2018-10-10 01:10:29 +00:00 |
|
|
|
3dccff6eea
|
Remove offending field that was stopping migration working
|
2018-10-09 21:10:27 -04:00 |
|
Weblate
|
8177685c55
|
Merge remote-tracking branch 'origin/master'
|
2018-10-05 13:29:29 +00:00 |
|
|
|
190f63abf8
|
Attempt a different migration to remove null from text fields
|
2018-10-05 09:29:24 -04:00 |
|
Weblate
|
78f094a8df
|
Merge remote-tracking branch 'origin/master'
|
2018-10-04 12:48:33 +00:00 |
|
Naomi
|
6220f62af3
|
Set the images_file field to non-required in both places
it was set to non-required in the form but not in reality
|
2018-10-04 13:47:31 +01:00 |
|
Naomi
|
a061bbbb06
|
Refactored tests, and added delay when placing map marker
|
2018-10-04 13:46:39 +01:00 |
|
Naomi
|
fa101e6a5f
|
Added test for long and short case study submissions
|
2018-10-04 11:30:21 +01:00 |
|
Naomi
|
19dac7ac8b
|
Added test for submitting form without filling in required fields
|
2018-10-04 09:43:11 +01:00 |
|
Weblate
|
210b6755a6
|
Merge remote-tracking branch 'origin/master'
|
2018-10-03 19:15:54 +00:00 |
|
Naomi
|
7e7d1d1d8a
|
Updated how the form jumps to errors on reload
It was inserting "#undefined" when there was no error
|
2018-10-03 20:13:38 +01:00 |
|
Weblate
|
c99e73c900
|
Merge remote-tracking branch 'origin/master'
|
2018-09-26 15:19:16 +00:00 |
|
Naomi
|
bc5cddb5ee
|
Added some documentation
|
2018-09-26 16:18:57 +01:00 |
|
Weblate
|
669924ab60
|
Merge remote-tracking branch 'origin/master'
|
2018-09-26 15:07:56 +00:00 |
|
Naomi
|
17f0efd424
|
Merge branch 'selenium'
|
2018-09-26 16:06:31 +01:00 |
|
Naomi
|
a12949fba1
|
Selenium test is now working
It uses chrome driver rather than firefox/gecko, however.
|
2018-09-26 16:05:03 +01:00 |
|
Naomi
|
3b0a440066
|
Making test fail on purpose, to test the pipeline
|
2018-09-26 15:58:21 +01:00 |
|
Naomi
|
7ce4c993f9
|
Added headlessness from here https://medium.com/@joyzoursky/recent-updates-6264d1e5d42f
|
2018-09-26 15:50:16 +01:00 |
|
Naomi
|
5faa9f628d
|
Merge branch 'selenium' of autonomic-git:autonomic-cooperative/ojuso-map into selenium
|
2018-09-26 15:39:48 +01:00 |
|
Naomi
|
949dca4abb
|
Switched selenium from using firefox to using chrome
|
2018-09-26 15:38:56 +01:00 |
|
Naomi
|
5f1068a3a3
|
Update .gitlab-ci.yml
|
2018-09-26 14:21:44 +00:00 |
|
Carl van Tonder
|
807bf87351
|
More detailed psycopg troubleshooting instructions
|
2018-09-26 15:09:35 +01:00 |
|
Carl van Tonder
|
bfb0ff9354
|
Drop -e from django-cas-server install
|
2018-09-26 15:09:35 +01:00 |
|
Naomi
|
87d4b3c6e7
|
Fixed https://gitlab.com/autonomic-cooperative/ojuso-map/issues/75
Changed position of the map container ("jumbo") from absolute to relative because with absolute position it did not move down when the menu expanded.
|
2018-09-26 15:09:35 +01:00 |
|
|
|
857714fb15
|
Fix failing test
|
2018-09-26 15:09:35 +01:00 |
|
|
|
de07e09b12
|
Try again
|
2018-09-26 15:09:35 +01:00 |
|
|
|
0e141a31f8
|
Try to fix tests again
|
2018-09-26 15:09:35 +01:00 |
|
Carl van Tonder
|
02bf06e9ad
|
Update docs, add example .env file
virtualenvwrapper guide, merge / tidy up database installation
instructions
|
2018-09-26 15:09:35 +01:00 |
|
Carl van Tonder
|
78b597166f
|
Ignore static dir in git
|
2018-09-26 15:09:35 +01:00 |
|
Carl van Tonder
|
a49c4224a9
|
Fix test failure
|
2018-09-26 15:09:35 +01:00 |
|
Carl van Tonder
|
b648c28d70
|
Fix crashing test
|
2018-09-26 15:09:35 +01:00 |
|
|
|
7df7d7df5b
|
Text fields shouldn't have null=True. (#94)
|
2018-09-26 15:09:35 +01:00 |
|
|
|
d1c3ca247a
|
Upgrade to Django 1.11 compatible version of django-cas-server
|
2018-09-26 15:09:35 +01:00 |
|
