| 
						
					 | 
					
						
						
							
						
						3a71ad5129
					 | 
					
						
						
							
							Install base requirements in GitLab CI
						
						
						
						
						
						
					 | 
					
						2018-11-24 13:53:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad64b646b1
					 | 
					
						
						
							
							Make local.yml just run a postgres + mailhog instance
						
						
						
						
						
						
					 | 
					
						2018-11-24 13:39:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0c7846704
					 | 
					
						
						
							
							Remove unused environment.sh file
						
						
						
						
						
						
					 | 
					
						2018-11-24 13:34:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b12b92b90d
					 | 
					
						
						
							
							Remove unused nginx config files
						
						
						
						
						
						
					 | 
					
						2018-11-24 13:34:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb7eff7648
					 | 
					
						
						
							
							Move requirements files to requirements/
						
						
						
						
						
						
					 | 
					
						2018-11-24 13:33:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						501fcabfb6
					 | 
					
						
						
							
							Remote unused files in bin/
						
						
						
						
						
						
					 | 
					
						2018-11-24 13:31:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0e886181e2
					 | 
					
						
						
							
							Move things to slightly more sensible locations
						
						
						
						
						
						
					 | 
					
						2018-11-24 12:58:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bdcc5363fc
					 | 
					
						
						
							
							Add AWS_DEFAULT_ACL to silence warning
						
						
						
						
						
						
					 | 
					
						2018-11-20 12:59:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c0b251bd0
					 | 
					
						
						
							
							Fix requirements
						
						
						
						
						
						
					 | 
					
						2018-11-20 12:59:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f962a7e0fa
					 | 
					
						
						
							
							Fix remove_null_from_text_fields migration
						
						
						
						
						
						
					 | 
					
						2018-11-20 12:59:28 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1256d0f52b
					 | 
					
						
						
							
							Upgrade to Django 2.1 using pip-tools
						
						
						
						
						
						
						
						Closes #88 
						
						
					 | 
					
						2018-11-14 12:26:59 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c28ed5e3b
					 | 
					
						
						
							
							https://gitlab.com/autonomic-cooperative/ojuso-map/issues/86 added layers
						
						
						
						
						
						
					 | 
					
						2018-11-04 14:27:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59e68ae771
					 | 
					
						
						
							
							Attempt using async workers to fix #72
						
						
						
						
						
						
					 | 
					
						2018-10-13 14:28:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						acfbb513de
					 | 
					
						
						
							
							Add points of interest
						
						
						
						
						
						
						
						Do a bunch of refactoring in the process.  Current display on homepage
is a little shonky but that can be improved when there is something
using it. 
						
						
					 | 
					
						2018-10-13 01:44:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2823445a4
					 | 
					
						
						
							
							Comment out unused user list API
						
						
						
						
						
						
					 | 
					
						2018-10-13 01:39:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87ae3731d3
					 | 
					
						
						
							
							Remove unused bundle.js file
						
						
						
						
						
						
					 | 
					
						2018-10-13 01:39:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e9f9b6f20d
					 | 
					
						
						
							
							Get docker working with new assets folder
						
						
						
						
						
						
					 | 
					
						2018-10-12 21:25:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac9090788a
					 | 
					
						
						
							
							Comment out non-working point of interest link
						
						
						
						
						
						
					 | 
					
						2018-10-12 20:29:31 -04: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						579bb73574
					 | 
					
						
						
							
							Add script to get into postgres on production
						
						
						
						
						
						
					 | 
					
						2018-10-09 21:23:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3dccff6eea
					 | 
					
						
						
							
							Remove offending field that was stopping migration working
						
						
						
						
						
						
					 | 
					
						2018-10-09 21:10:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						190f63abf8
					 | 
					
						
						
							
							Attempt a different migration to remove null from text fields
						
						
						
						
						
						
					 | 
					
						2018-10-05 09:29:24 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a061bbbb06
					 | 
					
						
						
							
							Refactored tests, and added delay when placing map marker
						
						
						
						
						
						
					 | 
					
						2018-10-04 13:46:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa101e6a5f
					 | 
					
						
						
							
							Added test for long and short case study submissions
						
						
						
						
						
						
					 | 
					
						2018-10-04 11:30:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						19dac7ac8b
					 | 
					
						
						
							
							Added test for submitting form without filling in required fields
						
						
						
						
						
						
					 | 
					
						2018-10-04 09:43:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc5cddb5ee
					 | 
					
						
						
							
							Added some documentation
						
						
						
						
						
						
					 | 
					
						2018-09-26 16:18:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17f0efd424
					 | 
					
						
						
							
							Merge branch 'selenium'
						
						
						
						
						
						
					 | 
					
						2018-09-26 16:06:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a12949fba1
					 | 
					
						
						
							
							Selenium test is now working
						
						
						
						
						
						
						
						It uses chrome driver rather than firefox/gecko, however. 
						
						
					 | 
					
						2018-09-26 16:05:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3b0a440066
					 | 
					
						
						
							
							Making test fail on purpose, to test the pipeline
						
						
						
						
						
						
					 | 
					
						2018-09-26 15:58:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ce4c993f9
					 | 
					
						
						
							
							Added headlessness from here https://medium.com/@joyzoursky/recent-updates-6264d1e5d42f
						
						
						
						
						
						
					 | 
					
						2018-09-26 15:50:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5faa9f628d
					 | 
					
						
						
							
							Merge branch 'selenium' of autonomic-git:autonomic-cooperative/ojuso-map into selenium
						
						
						
						
						
						
					 | 
					
						2018-09-26 15:39:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						949dca4abb
					 | 
					
						
						
							
							Switched selenium from using firefox to using chrome
						
						
						
						
						
						
					 | 
					
						2018-09-26 15:38:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5f1068a3a3
					 | 
					
						
						
							
							Update .gitlab-ci.yml
						
						
						
						
						
						
					 | 
					
						2018-09-26 14:21:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						807bf87351
					 | 
					
						
						
							
							More detailed psycopg troubleshooting instructions
						
						
						
						
						
						
					 | 
					
						2018-09-26 15:09:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bfb0ff9354
					 | 
					
						
						
							
							Drop -e from django-cas-server install
						
						
						
						
						
						
					 | 
					
						2018-09-26 15:09:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02bf06e9ad
					 | 
					
						
						
							
							Update docs, add example .env file
						
						
						
						
						
						
						
						virtualenvwrapper guide, merge / tidy up database installation
instructions 
						
						
					 | 
					
						2018-09-26 15:09:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |