Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								b151889518
								
							
						 | 
						
							
							
								
								Add missing popper javascript
							
							
							
							
							
						 | 
						
							2018-02-04 11:34:29 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ac1e0c4bb6
								
							
						 | 
						
							
							
								
								remove one wsgi worker to save some ram
							
							
							
							
							
						 | 
						
							2018-02-04 10:11:05 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								63f5402170
								
							
						 | 
						
							
							
								
								Change banner active to displayed
							
							
							
							
							
						 | 
						
							2018-02-03 20:28:47 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ffbd68f3a5
								
							
						 | 
						
							
							
								
								move debug toolbar
							
							
							
							
							
						 | 
						
							2018-02-03 20:15:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ae1f830785
								
							
						 | 
						
							
							
								
								Simplify config fix wiki styles.
							
							
							
							
							
						 | 
						
							2018-02-03 19:21:12 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								7426c1fb05
								
							
						 | 
						
							
							
								
								Check if banner images are active
							
							
							
							
							
						 | 
						
							2018-01-31 18:22:39 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								6ab5049e88
								
							
						 | 
						
							
							
								
								move requirement
							
							
							
							
							
						 | 
						
							2018-01-31 07:30:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								43a98f7164
								
							
						 | 
						
							
							
								
								Sass fix for permissions
							
							
							
							
							
						 | 
						
							2018-01-30 14:19:39 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								d345791fe3
								
							
						 | 
						
							
							
								
								updated config
							
							
							
							
							
						 | 
						
							2018-01-30 07:25:07 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ab36e264c1
								
							
						 | 
						
							
							
								
								change logging
							
							
							
							
							
						 | 
						
							2018-01-29 21:46:24 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								579478bb87
								
							
						 | 
						
							
							
								
								Adjust config for dev to be more like live
							
							
							
							
							
						 | 
						
							2018-01-29 14:30:11 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								693f624c8e
								
							
						 | 
						
							
							
								
								Clean up duplicate lines in production config
							
							
							
							
							
						 | 
						
							2018-01-29 07:34:40 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								0c01228a05
								
							
						 | 
						
							
							
								
								adjust permissions
							
							
							
							
							
						 | 
						
							2018-01-28 12:25:04 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								95d45661b3
								
							
						 | 
						
							
							
								
								Updated containerr versions
							
							
							
							
							
						 | 
						
							2018-01-27 21:55:26 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								8eeecaae24
								
							
						 | 
						
							
							
								
								Add cache header for static files
							
							
							
							
							
						 | 
						
							2018-01-27 16:56:06 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								4958b15034
								
							
						 | 
						
							
							
								
								Footer css tweaks
							
							
							
							
							
						 | 
						
							2018-01-27 16:43:31 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								d56eaf0c81
								
							
						 | 
						
							
							
								
								Fix page footer
							
							
							
							
							
						 | 
						
							2018-01-27 16:27:55 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								08b932d9af
								
							
						 | 
						
							
							
								
								Updated configuration
							
							
							
							
							
						 | 
						
							2018-01-27 12:43:12 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								2b8fd8b73f
								
							
						 | 
						
							
							
								
								Add x attribute
							
							
							
							
							
						 | 
						
							2018-01-27 09:37:16 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								bf3a5170b4
								
							
						 | 
						
							
							
								
								Add bucket container to stge and live remove node container
							
							
							
							
							
						 | 
						
							2018-01-26 20:02:24 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								b662c38607
								
							
						 | 
						
							
							
								
								adjusted config for local and prod
							
							
							
							
							
						 | 
						
							2018-01-26 13:53:42 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								e2dc3f331d
								
							
						 | 
						
							
							
								
								Add in place holder files
							
							
							
							
							
						 | 
						
							2018-01-26 13:20:21 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								bff7fe8950
								
							
						 | 
						
							
							
								
								Updated readme with backup info
							
							
							
							
							
						 | 
						
							2018-01-26 07:36:08 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								70589679a6
								
							
						 | 
						
							
							
								
								Updated deploy steps
							
							
							
							
							
						 | 
						
							2018-01-25 21:45:13 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								26f948d7a9
								
							
						 | 
						
							
							
								
								test deploy settings
							
							
							
							
							
						 | 
						
							2018-01-25 21:13:45 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								f77a1d75c7
								
							
						 | 
						
							
							
								
								remove old package file, update drone config
							
							
							
							
							
						 | 
						
							2018-01-25 20:59:53 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								f466e80d2a
								
							
						 | 
						
							
							
								
								Fixed top nav to work with bootstrap 4
							
							
							
							
							
						 | 
						
							2018-01-25 20:09:14 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								0b2f333ad7
								
							
						 | 
						
							
							
								
								Bootstrap 4 final release update
							
							
							
							
							
						 | 
						
							2018-01-25 14:19:33 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ce976ccfb1
								
							
						 | 
						
							
							
								
								Merge branch 'tests'
							
							
							
							
							
						 | 
						
							2018-01-24 22:55:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								c1c9dcc38b
								
							
						 | 
						
							
							
								
								Add collect static and compile scss
							
							
							
							
							
						 | 
						
							2018-01-24 22:37:02 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								bbbaf1ffc9
								
							
						 | 
						
							
							
								
								Add collect static and compile scss
							
							
							
							
							
						 | 
						
							2018-01-24 13:58:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								1e18c2d2e0
								
							
						 | 
						
							
							
								
								Fix final test
							
							
							
							
							
						 | 
						
							2018-01-24 13:28:00 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								5008051d88
								
							
						 | 
						
							
							
								
								Fixup tests into working state one left to fix
							
							
							
							
							
						 | 
						
							2018-01-23 22:07:43 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								bf695f823d
								
							
						 | 
						
							
							
								
								Add stage to allowed hosts
							
							
							
							
							
						 | 
						
							2018-01-23 07:15:19 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								8ec2e5cd29
								
							
						 | 
						
							
							
								
								Remove volume causing permission issues
							
							
							
							
							
						 | 
						
							2018-01-22 22:36:02 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								9a25b90f06
								
							
						 | 
						
							
							
								
								remove copy pasta in config
							
							
							
							
							
						 | 
						
							2018-01-22 21:12:44 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								84db2d43d9
								
							
						 | 
						
							
							
								
								Add useful commands to readme, chane ownership of log file
							
							
							
							
							
						 | 
						
							2018-01-22 21:11:09 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								52bab868ff
								
							
						 | 
						
							
							
								
								Changes to allow local bucket work inside and outside container
							
							
							
							
							
						 | 
						
							2018-01-22 14:31:54 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								276a87c0b3
								
							
						 | 
						
							
							
								
								Now on the bucket list :)
							
							
							
							
							
						 | 
						
							2018-01-21 21:06:51 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								c3f9a377c9
								
							
						 | 
						
							
							
								
								Fixes to make django markdown work with the wiki
							
							
							
							
							
						 | 
						
							2018-01-20 14:29:04 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								61ca8968ae
								
							
						 | 
						
							
							
								
								Requests form updated
							
							
							
							
							
						 | 
						
							2018-01-18 21:44:49 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								85dfd065e6
								
							
						 | 
						
							
							
								
								Merge branch 'requests'
							
							
							
							
							
						 | 
						
							2018-01-18 18:57:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								7d67e9e9e5
								
							
						 | 
						
							
							
								
								requests wip
							
							
							
							
							
						 | 
						
							2018-01-18 14:12:23 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								67facc06f1
								
							
						 | 
						
							
							
								
								Fix for martor markdown display.
							
							
							
							
							
						 | 
						
							2018-01-16 22:12:50 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								9d50b92f40
								
							
						 | 
						
							
							
								
								Fix up user rfid urls
							
							
							
							
							
						 | 
						
							2018-01-15 18:32:19 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								1fb2b65df2
								
							
						 | 
						
							
							
								
								Added flag to track completed equipment requests
							
							
							
							
							
						 | 
						
							2018-01-14 18:25:02 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								afdb834daf
								
							
						 | 
						
							
							
								
								Disable django wiki login pages and use the default django pages
							
							
							
							
							
						 | 
						
							2018-01-06 21:11:58 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								9f9f9e4795
								
							
						 | 
						
							
							
								
								Updated draceditor to martor, project was renamed.
							
							
							
							
							
						 | 
						
							2018-01-06 20:59:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								8678c06108
								
							
						 | 
						
							
							
								
								Added basic creation and deletion buttons for RFID
							
							
							
							
							
						 | 
						
							2017-11-01 17:57:10 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								8a2fa40f04
								
							
						 | 
						
							
							
								
								Change include to use custom django wiki temporarily
							
							
							
							
							
						 | 
						
							2017-10-30 13:41:36 +00:00 |