Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d861d8bfb8
					 | 
					
						
						
							
							Fixes #1118: Allow designating an IP as primary for a device while editing the IP
						
						
						
						
						
						
					 | 
					
						2017-05-02 16:46:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						6791ff6192
					 | 
					
						
						
							
							Fixes #1125: Include MAC addresses on a device's interface list
						
						
						
						
						
						
					 | 
					
						2017-05-02 15:01:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						de58d0ecca
					 | 
					
						
						
							
							Fixes #1114: Suppress OSError when attempting to access a delete image attachment
						
						
						
						
						
						
					 | 
					
						2017-04-28 14:26:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4b2e7620dd
					 | 
					
						
						
							
							Switched user nav menu with search form
						
						
						
						
						
						
					 | 
					
						2017-04-27 13:27:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f73693206f
					 | 
					
						
						
							
							Merge branch 'develop' into v2-develop
						
						
						
						
						
						
						
						Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh 
						
						
					 | 
					
						2017-04-21 15:07:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						13cc29cd8c
					 | 
					
						
						
							
							Closes #951: Provide a side-by-side view of rack elevations
						
						
						
						
						
						
					 | 
					
						2017-04-20 13:07:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						401357b8cb
					 | 
					
						
						
							
							Closes #1084: Include custom fields when creating IP addresses in bulk
						
						
						
						
						
						
					 | 
					
						2017-04-19 14:50:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						b01bf6089c
					 | 
					
						
						
							
							Merge branch 'develop' into v2-develop
						
						
						
						
						
						
						
						Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py 
						
						
					 | 
					
						2017-04-13 15:42:50 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						610b412506
					 | 
					
						
						
							
							#878: Layout tweaks
						
						
						
						
						
						
					 | 
					
						2017-04-13 15:09:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						09000ad9b3
					 | 
					
						
						
							
							Closes #1001: Merged IP interface assignment into ipam.IPAddressForm
						
						
						
						
						
						
					 | 
					
						2017-04-13 14:54:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f70f0f8d62
					 | 
					
						
						
							
							Improved handling of return_url for object edit/delete views; removed manual definitions of initial data fields
						
						
						
						
						
						
					 | 
					
						2017-04-13 13:11:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d5c3f9e780
					 | 
					
						
						
							
							#878: Show assigned IP addresses in device interfaces list
						
						
						
						
						
						
					 | 
					
						2017-04-12 22:02:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						b42dab3eef
					 | 
					
						
						
							
							Differentiate between LAG and virtual interfaces in device interface list
						
						
						
						
						
						
					 | 
					
						2017-04-12 16:06:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ba1a4f06ff
					 | 
					
						
						
							
							Replace tabs with spaces
						
						
						
						
						
						
					 | 
					
						2017-04-10 10:55:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						cf5be85dad
					 | 
					
						
						
							
							Closes #1061: Escape all messages by default (complements #1062)
						
						
						
						
						
						
					 | 
					
						2017-04-10 10:54:35 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						57fc6a3f50
					 | 
					
						
						
							
							Merge branch 'develop' into v2-develop
						
						
						
						
						
						
						
						Conflicts:
	netbox/netbox/settings.py
	netbox/netbox/urls.py
	requirements.txt 
						
						
					 | 
					
						2017-04-06 17:01:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						2c99a8bee4
					 | 
					
						
						
							
							Closes #1052: Added rack reservation list and bulk delete views
						
						
						
						
						
						
					 | 
					
						2017-04-06 16:26:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						82d53a8c3d
					 | 
					
						
						
							
							Fixes #1049: Prompt user if missing session key when adding/editing a secret
						
						
						
						
						
						
					 | 
					
						2017-04-06 13:55:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						f3eee25527
					 | 
					
						
						
							
							Fixes #1051: Upgraded django-rest-swagger
						
						
						
						
						
						
					 | 
					
						2017-04-06 11:54:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ee11775425
					 | 
					
						
						
							
							Fixes #1051: Upgraded django-rest-swagger
						
						
						
						
						
						
					 | 
					
						2017-04-06 09:40:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4accdf77f8
					 | 
					
						
						
							
							Closes #578: Show topology maps not assigned to a site on the home view
						
						
						
						
						
						
					 | 
					
						2017-04-05 17:33:39 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						409c9c4e23
					 | 
					
						
						
							
							Merge branch 'develop' into v2-develop
						
						
						
						
						
						
						
						Conflicts:
	netbox/netbox/settings.py 
						
						
					 | 
					
						2017-04-04 12:06:49 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						11ae938146
					 | 
					
						
						
							
							Fixes #1027: Fixed nav menu highlighting when BASE_PATH is set
						
						
						
						
						
						
					 | 
					
						2017-04-04 11:55:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen
							
						 
					 | 
					
						
						
							
						
						f11bb254a5
					 | 
					
						
						
							
							Only show Custom Fields on IP Address Assign Page if custom fields are set against the ip address (#1031)
						
						
						
						
						
						
					 | 
					
						2017-04-04 11:37:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ca293dc0e7
					 | 
					
						
						
							
							Corrected topology map link
						
						
						
						
						
						
					 | 
					
						2017-04-03 16:34:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						ea1d4e7f50
					 | 
					
						
						
							
							Updated static CSS/JS libraries
						
						
						
						
						
						
					 | 
					
						2017-04-03 16:15:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						51725d3d9c
					 | 
					
						
						
							
							Added a search box to the navigation menu
						
						
						
						
						
						
					 | 
					
						2017-04-03 15:33:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						50d7fd776f
					 | 
					
						
						
							
							Added image attachments to sites and devices
						
						
						
						
						
						
					 | 
					
						2017-03-31 15:19:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						b643939cc4
					 | 
					
						
						
							
							Initial work on #152: Image attachments
						
						
						
						
						
						
					 | 
					
						2017-03-30 21:55:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3ed3e93b25
					 | 
					
						
						
							
							Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade
						
						
						
						
						
						
					 | 
					
						2017-03-30 15:40:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						66615f1a96
					 | 
					
						
						
							
							Prettied things up a bit
						
						
						
						
						
						
					 | 
					
						2017-03-29 16:45:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						a5dc91c175
					 | 
					
						
						
							
							Introduced SearchTable for improved performance
						
						
						
						
						
						
					 | 
					
						2017-03-29 16:05:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d04436aa0a
					 | 
					
						
						
							
							Search form improvements
						
						
						
						
						
						
					 | 
					
						2017-03-29 14:22:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						6813787fc7
					 | 
					
						
						
							
							Fixes #1013: Show edit/delete reservation buttons on rack view
						
						
						
						
						
						
					 | 
					
						2017-03-29 12:15:14 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						afdb24610d
					 | 
					
						
						
							
							Initial work on global search
						
						
						
						
						
						
					 | 
					
						2017-03-29 12:04:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						576e21eb65
					 | 
					
						
						
							
							Merge branch 'develop' into v2-develop
						
						
						
						
						
						
						
						Conflicts:
	netbox/netbox/settings.py 
						
						
					 | 
					
						2017-03-23 17:14:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						47120fae01
					 | 
					
						
						
							
							Rack assignment is optional for devices
						
						
						
						
						
						
					 | 
					
						2017-03-23 15:36:24 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						66a6a8f33c
					 | 
					
						
						
							
							Closes #983: Include peer device names when listing circuits in device view
						
						
						
						
						
						
					 | 
					
						2017-03-22 16:58:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						a5419ecc5c
					 | 
					
						
						
							
							RPC API fixes
						
						
						
						
						
						
					 | 
					
						2017-03-21 17:24:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						93c748bd3c
					 | 
					
						
						
							
							Merge branch 'develop' into api2
						
						
						
						
						
						
					 | 
					
						2017-03-21 14:10:53 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						22768ff6c6
					 | 
					
						
						
							
							Renamed Module to InventoryItem (prep for #824)
						
						
						
						
						
						
					 | 
					
						2017-03-21 12:54:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						1682de59df
					 | 
					
						
						
							
							Added a footer link to the GitHub wiki
						
						
						
						
						
						
					 | 
					
						2017-03-20 14:05:26 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						3dc15068b9
					 | 
					
						
						
							
							Allow user to delete session key
						
						
						
						
						
						
					 | 
					
						2017-03-14 14:01:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						4cb30f1ce4
					 | 
					
						
						
							
							Relate SessionKey to UserKey rather than User
						
						
						
						
						
						
					 | 
					
						2017-03-14 13:32:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						b868de8d67
					 | 
					
						
						
							
							Updated user URLs
						
						
						
						
						
						
					 | 
					
						2017-03-14 12:59:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						04aedcc056
					 | 
					
						
						
							
							Merge branch 'develop' into api2
						
						
						
						
						
						
						
						Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py 
						
						
					 | 
					
						2017-03-14 12:40:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						d9f1bcbf15
					 | 
					
						
						
							
							Renamed user URL namespace
						
						
						
						
						
						
					 | 
					
						2017-03-14 12:36:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						105d17748e
					 | 
					
						
						
							
							Secrets UI work
						
						
						
						
						
						
					 | 
					
						2017-03-14 12:32:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						cd97b2fb96
					 | 
					
						
						
							
							Fix parent device position display
						
						
						
						
						
						
					 | 
					
						2017-03-13 11:25:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeremy Stretch
							
						 
					 | 
					
						
						
							
						
						68c099a2af
					 | 
					
						
						
							
							Merge branch 'develop' into api2
						
						
						
						
						
						
						
						Conflicts:
	netbox/netbox/settings.py 
						
						
					 | 
					
						2017-03-08 15:18:32 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |