Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						891a128736 
					 
					
						
						
							
							Cleaned up 'not connected' text  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 16:01:18 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a74ddd8527 
					 
					
						
						
							
							Merge pull request  #210  from peelman/develop  
						
						 
						
						... 
						
						
						
						critical connections placeholder should span 5 rows now 
						
						
							
						
					 
					
						2016-07-06 15:57:04 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						24c48bece8 
					 
					
						
						
							
							Fixes   #209 : Read pk list from POST instead of form  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 15:55:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						a069e92ce0 
					 
					
						
						
							
							critical connections placeholder should span 5 rows now  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 15:46:00 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c0ab9f70dc 
					 
					
						
						
							
							Standardized console/power/interface display  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 14:40:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						cc17604220 
					 
					
						
						
							
							Force 48-bit MAC format for proper error messages during validation  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 14:22:34 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9793b406e9 
					 
					
						
						
							
							Merge pull request  #170  from peelman/add-mac-address-to-interface  
						
						 
						
						... 
						
						
						
						Add mac address to interface 
						
						
							
						
					 
					
						2016-07-06 13:38:46 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						7a2f6eaf34 
					 
					
						
						
							
							Regenerate migration  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:22:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						dc847ce4d6 
					 
					
						
						
							
							Fix connected interface template rendering...  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						578013fdd2 
					 
					
						
						
							
							Fix PEP8 compliance...(again)  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						9f75d5bd23 
					 
					
						
						
							
							Fix PEP8 compliance...  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						a6d41c95b8 
					 
					
						
						
							
							Remove external macaddress package dependency  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						9da4c28cd5 
					 
					
						
						
							
							Tests pass now  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						0ce92cb2ee 
					 
					
						
						
							
							Add fixtures for mac addresses. add mac addresses to api tests  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						6fb530b75d 
					 
					
						
						
							
							Relocate Add Interface button to match the style used in the rest of the view  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						5034b836ea 
					 
					
						
						
							
							Add MAC address field to interfaces  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-06 13:21:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						35f3355cfe 
					 
					
						
						
							
							Merge pull request  #207  from ryanmerolle/develop  
						
						 
						
						... 
						
						
						
						Updated Upgrade Instructions & apt-get install 
						
						
							
						
					 
					
						2016-07-06 12:48:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ryanmerolle 
							
						 
					 
					
						
						
							
						
						65514102cd 
					 
					
						
						
							
							Updated Upgrade Instructions & apt-get install  
						
						 
						
						... 
						
						
						
						I accidentally submitted my last 2 changes to master instead of develop.  This corrects the mistake. 
						
						
							
						
					 
					
						2016-07-06 12:26:45 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						343b65cb50 
					 
					
						
						
							
							Merge pull request  #205  from ryanmerolle/patch-2  
						
						 
						
						... 
						
						
						
						Updated Upgrade Instructions 
						
						
							
						
					 
					
						2016-07-06 11:50:01 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ryanmerolle 
							
						 
					 
					
						
						
							
						
						33d755d51a 
					 
					
						
						
							
							Updated Upgrade Instructions  
						
						 
						
						... 
						
						
						
						Streamlined update process for newer users like myself.  Now includes exact instructions for downloading latest release or using git. 
						
						
							
						
					 
					
						2016-07-06 10:10:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dinoocch 
							
						 
					 
					
						
						
							
						
						9750da4761 
					 
					
						
						
							
							Add LDAP Authentication Documentation  
						
						 
						
						... 
						
						
						
						Addresses #65 
This commit adds documentation for installing and configuring ldap
authentication for netbox.
It may be beneficial to add settings to the configuration.py instead of
editing settings.py if this is an important feature. 
						
						
							
						
					 
					
						2016-07-05 22:10:14 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d974cecda3 
					 
					
						
						
							
							Fixes   #199 : Moved prefix_validator from BaseIPField to IPNetworkField  
						
						 
						
						
						
						
							
  v1.0.7-r1
 
						
					 
					
						2016-07-05 18:15:24 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5e9090a03a 
					 
					
						
						
							
							Revert "v1.1.0 release"  
						
						 
						
						... 
						
						
						
						This reverts commit e8b8b015bb . 
						
						
							
						
					 
					
						2016-07-05 18:12:05 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						60b48f9e4e 
					 
					
						
						
							
							Merge branch 'master' of github.com:digitalocean/netbox into develop  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 18:00:35 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e8b8b015bb 
					 
					
						
						
							
							v1.1.0 release  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 18:00:12 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7021ce2ecf 
					 
					
						
						
							
							Merge branch 'develop' of github.com:digitalocean/netbox into develop  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 17:36:44 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						58e23a9773 
					 
					
						
						
							
							Merge branch 'devicetype-fixes' into develop  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 17:36:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						064582f6c5 
					 
					
						
						
							
							Improve DeviceType display (credit to @peelman); add validation for DeviceType components  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 17:30:16 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						75789fc956 
					 
					
						
						
							
							Merge pull request  #188  from ChristianKniep/no_local_mounts  
						
						 
						
						... 
						
						
						
						No local mounts 
						
						
							
						
					 
					
						2016-07-05 16:49:12 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1c159968bf 
					 
					
						
						
							
							Merge pull request  #184  from koep/develop  
						
						 
						
						... 
						
						
						
						Add vi swap files to gitignore 
						
						
							
						
					 
					
						2016-07-05 16:47:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1b5231c188 
					 
					
						
						
							
							Merge pull request  #197  from digitalocean/device-bays  
						
						 
						
						... 
						
						
						
						Device bays 
						
						
							
						
					 
					
						2016-07-05 16:44:06 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						dc3cbfcdd4 
					 
					
						
						
							
							Fixes   #199 : Moved prefix_validator from BaseIPField to IPNetworkField  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 16:39:43 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ee65d3f406 
					 
					
						
						
							
							Fix DeviceBay inclusion in admin UI  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 16:35:44 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fc9aa03dc1 
					 
					
						
						
							
							Improved device bay documentation  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 16:20:33 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						34c332d165 
					 
					
						
						
							
							Updated documentation to include device bays  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 16:02:11 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c57e63ff00 
					 
					
						
						
							
							Fixed API tests  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 15:50:21 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						14502123d8 
					 
					
						
						
							
							Minor version increment for new feature (device bays)  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 15:34:12 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						80c8d2f0c0 
					 
					
						
						
							
							Added parent_device to DeviceSerializer  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 15:32:16 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						acccdc09f2 
					 
					
						
						
							
							Fixing dumb indent mistake...  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 15:14:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						20e3ef9a04 
					 
					
						
						
							
							make device type network/console/power tables show based on device type settings  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 15:00:25 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nick Peelman 
							
						 
					 
					
						
						
							
						
						db9b0dcaef 
					 
					
						
						
							
							Fixing a nesting/logic issue on device type edit/delete buttons  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 14:59:29 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						97fbfeecc3 
					 
					
						
						
							
							Extended API to include DeviceBays  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 13:43:19 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7eae636562 
					 
					
						
						
							
							Added DeviceType to device bays table  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-05 13:42:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kniep 
							
						 
					 
					
						
						
							
						
						af87345637 
					 
					
						
						
							
							remove debug port exposure for netbox  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-04 10:51:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kniep 
							
						 
					 
					
						
						
							
						
						85c55cd27f 
					 
					
						
						
							
							use volumes of netbox, holding default config  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-04 10:42:24 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kniep 
							
						 
					 
					
						
						
							
						
						6e1f8d3503 
					 
					
						
						
							
							put config into netbox image  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-04 10:42:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Koep 
							
						 
					 
					
						
						
							
						
						60cc88bcde 
					 
					
						
						
							
							Add vi swap files to gitignore  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-02 17:30:12 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8b7d86df5a 
					 
					
						
						
							
							Merge branch 'develop' of github.com:digitalocean/netbox into develop  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-01 18:20:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a5066a905e 
					 
					
						
						
							
							Added a note to CONTRIBUTING about opening an issue before submitting a PR  
						
						 
						
						
						
						
							
						
					 
					
						2016-07-01 18:20:06 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						aabe641d63 
					 
					
						
						
							
							Merge pull request  #107  from koep/develop  
						
						 
						
						... 
						
						
						
						Add option to dockerize netbox 
						
						
							
						
					 
					
						2016-07-01 18:02:33 -04:00