Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						779446da64 
					 
					
						
						
							
							Fixes   #1187 : Fixed table pagination by introducing a custom table template  
						
						 
						
						
						
						
					 
					
						2017-05-16 16:19:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f9b2c59974 
					 
					
						
						
							
							Moved tenancy to separate panel on bulk IP creation form  
						
						 
						
						
						
						
					 
					
						2017-05-12 12:04:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a870a3b918 
					 
					
						
						
							
							Fixes   #1166 : Re-implemented bulk IP address creation  
						
						 
						
						
						
						
					 
					
						2017-05-12 12:00:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						473b35f9a3 
					 
					
						
						
							
							Added tenant_group/tenant form section to all objects with tenancy  
						
						 
						
						
						
						
					 
					
						2017-05-11 17:35:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5ca87c0f20 
					 
					
						
						
							
							Merge branch 'develop' into v2-develop  
						
						 
						
						
						
						
					 
					
						2017-05-08 15:02:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						79089cc47e 
					 
					
						
						
							
							Introduced an object import template  
						
						 
						
						
						
						
					 
					
						2017-05-03 15:41:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						09000ad9b3 
					 
					
						
						
							
							Closes   #1001 : Merged IP interface assignment into ipam.IPAddressForm  
						
						 
						
						
						
						
					 
					
						2017-04-13 14:54:17 -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 
							
						 
					 
					
						
						
							
						
						c0152940f9 
					 
					
						
						
							
							Merged develop  
						
						 
						
						
						
						
					 
					
						2017-02-28 16:10:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f3b9930dea 
					 
					
						
						
							
							Initial work on regions  
						
						 
						
						
						
						
					 
					
						2017-02-28 12:11:43 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b0f9035e2d 
					 
					
						
						
							
							Additional work on  #904  
						
						 
						
						
						
						
					 
					
						2017-02-21 14:53:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shawn Peng 
							
						 
					 
					
						
						
							
						
						aba9748ffd 
					 
					
						
						
							
							Fix   #235 : Enable global vlan ( #904 )  
						
						 
						
						... 
						
						
						
						* Fix  #235 : Enable global vlan
Decouple site/vlan, make site optional for vlan/vlangroup
Change html generation code to check site existence before
dereference
Create site search function, if site is None for a VLAN, view it as
global VLAN
* commit1
* commit2
* commit3
* Add migration file for VLAN&VLAN group
* Revert unintentional commits 
						
						
					 
					
						2017-02-21 13:27:24 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5d5d4ac714 
					 
					
						
						
							
							Fixes   #845 : Fix missing edit/delete buttons on object tables for non-superusers  
						
						 
						
						
						
						
					 
					
						2017-01-26 13:20:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1317c0dd8c 
					 
					
						
						
							
							Closes   #841 : Merged search and filter forms on all object lists  
						
						 
						
						
						
						
					 
					
						2017-01-24 12:05:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						52420945b2 
					 
					
						
						
							
							Standardized naming of return_url for all object views  
						
						 
						
						
						
						
					 
					
						2017-01-23 14:07:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						03859d7287 
					 
					
						
						
							
							Closes   #803 : Clarify that no child objects are deleted when deleting a prefix  
						
						 
						
						
						
						
					 
					
						2017-01-17 14:52:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8edaff860c 
					 
					
						
						
							
							Fixes   #658 : Added is_pool field to Prefix model  
						
						 
						
						
						
						
					 
					
						2016-12-27 15:07:52 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9fd9719d0b 
					 
					
						
						
							
							Closes   #181 : Implemented support for bulk IP address creation  
						
						 
						
						
						
						
					 
					
						2016-12-20 15:39:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f02c222d4f 
					 
					
						
						
							
							Closes   #539 : Implemented L4 services for devices  
						
						 
						
						
						
						
					 
					
						2016-12-15 15:32:58 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6a9f26a68d 
					 
					
						
						
							
							Cleaned up attribute tables  
						
						 
						
						
						
						
					 
					
						2016-12-14 17:09:33 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bf817eb69e 
					 
					
						
						
							
							Closes   #49 : Introduction of circuit terminations  
						
						 
						
						
						
						
					 
					
						2016-12-14 13:47:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						298ac1ba7a 
					 
					
						
						
							
							Widened page layout; improved mobile rendering  
						
						 
						
						
						
						
					 
					
						2016-12-09 16:23:11 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f007b0dbde 
					 
					
						
						
							
							Closes   #695 : Added is_private field to RIR  
						
						 
						
						
						
						
					 
					
						2016-12-06 13:59:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dc88cb5ac7 
					 
					
						
						
							
							Fixes   #718 : Restore is_primary field on IP assignment form  
						
						 
						
						
						
						
					 
					
						2016-12-01 14:54:20 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						cc79b1136b 
					 
					
						
						
							
							Fixes   #696 : Corrected link to VRF in prefix and IP address breadcrumbs  
						
						 
						
						
						
						
					 
					
						2016-11-18 09:49:04 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a0ee6b0d58 
					 
					
						
						
							
							Closes   #667 : Added stats to RIR list view  
						
						 
						
						
						
						
					 
					
						2016-11-11 15:02:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d891c8c981 
					 
					
						
						
							
							Incorporated stats into RIR list view  
						
						 
						
						
						
						
					 
					
						2016-11-11 12:45:24 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						13cdc44caf 
					 
					
						
						
							
							#667 : Initial work on RIR statistics  
						
						 
						
						
						
						
					 
					
						2016-11-04 16:04:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e22eafc4a7 
					 
					
						
						
							
							Closes   #211 : Allow device assignment and removal from IP address view  
						
						 
						
						
						
						
					 
					
						2016-10-24 15:07:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						13243785f1 
					 
					
						
						
							
							Closes   #87 : Added status field to IP addresses  
						
						 
						
						
						
						
					 
					
						2016-10-21 12:34:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5b7f350ded 
					 
					
						
						
							
							Added headers to all bulk edit tables  
						
						 
						
						
						
						
					 
					
						2016-09-28 17:20:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						687e68db69 
					 
					
						
						
							
							Fixes   #564 : Display custom fields for all applicable objects  
						
						 
						
						
						
						
					 
					
						2016-09-19 16:13:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b10e29aaac 
					 
					
						
						
							
							Closes   #561 : Make custom fields accessible from within export templates  
						
						 
						
						
						
						
					 
					
						2016-09-19 16:11:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ce9d853883 
					 
					
						
						
							
							Closes   #415 : Added an expand/collapse toggle button to the prefix list  
						
						 
						
						
						
						
					 
					
						2016-09-16 11:50:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						faed3c1314 
					 
					
						
						
							
							Merged develop  
						
						 
						
						
						
						
					 
					
						2016-08-22 15:49:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						eab18a81c9 
					 
					
						
						
							
							Adjusted display of created and last_updated times for primary objects  
						
						 
						
						
						
						
					 
					
						2016-08-19 12:19:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a9a55350df 
					 
					
						
						
							
							Merging v1.5.2  
						
						 
						
						
						
						
					 
					
						2016-08-16 10:19:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d045429b51 
					 
					
						
						
							
							Fixes   #469 : Added missing import buttons to list views  
						
						 
						
						
						
						
					 
					
						2016-08-15 17:57:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c60c4ad0df 
					 
					
						
						
							
							Added templates for IPAM objects; cleaned up admin  
						
						 
						
						
						
						
					 
					
						2016-08-15 16:58:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6cdb62b67e 
					 
					
						
						
							
							Minimal implemtnation of custom fields  
						
						 
						
						
						
						
					 
					
						2016-08-15 15:24:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ac2aa7ea89 
					 
					
						
						
							
							Fixes   #435 : Added a "add prefix" button to the VLAN view  
						
						 
						
						
						
						
					 
					
						2016-08-06 15:44:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1fd189f9b1 
					 
					
						
						
							
							Replaced most glyphicons with Font Awesome  
						
						 
						
						
						
						
					 
					
						2016-08-01 13:29:45 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						65ea2af4b7 
					 
					
						
						
							
							Partial conversion from glyphicons to font awesome  
						
						 
						
						
						
						
					 
					
						2016-07-29 18:04:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8a9c6ce37a 
					 
					
						
						
							
							Standardized display of attributes for primary objects  
						
						 
						
						
						
						
					 
					
						2016-07-29 15:31:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						75c3e62ca8 
					 
					
						
						
							
							Changed VRF and VLAN views to use PrefixBriefTable  
						
						 
						
						
						
						
					 
					
						2016-07-29 13:03:44 -04:00