Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9313ba08ed 
					 
					
						
						
							
							Implemented recursive regions with django-mptt  
						
						 
						
						
						
						
					 
					
						2017-02-28 14:15:15 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f3b9930dea 
					 
					
						
						
							
							Initial work on regions  
						
						 
						
						
						
						
					 
					
						2017-02-28 12:11:43 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8f42f59a80 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py 
						
						
					 
					
						2017-02-27 17:04:08 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b0f9035e2d 
					 
					
						
						
							
							Additional work on  #904  
						
						 
						
						
						
						
					 
					
						2017-02-21 14:53:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jasperswaagman 
							
						 
					 
					
						
						
							
						
						7d1aeede1a 
					 
					
						
						
							
							Typo  
						
						 
						
						
						
						
					 
					
						2017-02-21 15:20:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b71566f206 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						 
						
						... 
						
						
						
						Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py 
						
						
					 
					
						2017-02-16 14:28:06 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6e10fea119 
					 
					
						
						
							
							Started API documentation  
						
						 
						
						
						
						
					 
					
						2017-02-01 14:04:45 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew Yauch 
							
						 
					 
					
						
						
							
						
						c91f41e984 
					 
					
						
						
							
							Update upgrading.md  
						
						 
						
						... 
						
						
						
						Added directive to copy the LDAP configuration if in use.  I upgraded a whole two versions before realizing my LDAP was broken. 
						
						
					 
					
						2017-01-26 15:28:11 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2d9c33c34f 
					 
					
						
						
							
							Tweaked installation docs to include instructions for Python 2 and 3  
						
						 
						
						
						
						
					 
					
						2017-01-23 17:01:23 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jens L 
							
						 
					 
					
						
						
							
						
						80439c495e 
					 
					
						
						
							
							Basic Support for Python 3 ( #827 )  
						
						 
						
						... 
						
						
						
						* Rudimentary python3 support
* update docs and trigger Travis
* fix some of the tests
* fix all python3 errors
* change env calls to just python
* add @python_2_unicode_compatible decorator to models for python2 compatibility
* switch netbox.configuration to from netbox import configuration 
						
						
					 
					
						2017-01-23 16:44:29 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						73ae87aa57 
					 
					
						
						
							
							Updated circuits documentation  
						
						 
						
						
						
						
					 
					
						2017-01-05 17:06:30 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						31e8986e35 
					 
					
						
						
							
							Minor docs tweaks  
						
						 
						
						
						
						
					 
					
						2017-01-03 14:03:50 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						49dd5761f8 
					 
					
						
						
							
							Tweaked web server installation docs  
						
						 
						
						
						
						
					 
					
						2017-01-03 13:44:22 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f02c222d4f 
					 
					
						
						
							
							Closes   #539 : Implemented L4 services for devices  
						
						 
						
						
						
						
					 
					
						2016-12-15 15:32:58 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b275009544 
					 
					
						
						
							
							Fixed missing  on command block  
						
						 
						
						
						
						
					 
					
						2016-11-30 12:10:46 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d960481adb 
					 
					
						
						
							
							Ditched syntax highlighting for shell commands  
						
						 
						
						
						
						
					 
					
						2016-11-30 12:07:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2986840755 
					 
					
						
						
							
							Specified syntax for code blocks  
						
						 
						
						
						
						
					 
					
						2016-11-30 12:01:45 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ea92e92c5a 
					 
					
						
						
							
							Fixes   #632 : Use semicolons instead of commas to separate regexes in topology maps  
						
						 
						
						
						
						
					 
					
						2016-11-03 14:49:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christophe CHAUVET 
							
						 
					 
					
						
						
							
						
						998608111f 
					 
					
						
						
							
							Fix path to find configuration.py on migration  
						
						 
						
						
						
						
					 
					
						2016-10-20 09:55:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						833499ffe8 
					 
					
						
						
							
							#212 : Introduced BASE_PATH configuration setting  
						
						 
						
						
						
						
					 
					
						2016-09-29 16:32:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a803bd8033 
					 
					
						
						
							
							Simplified web server installation doc  
						
						 
						
						
						
						
					 
					
						2016-09-26 14:21:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0001bbc966 
					 
					
						
						
							
							#447 : Correcting CentOS installation docs  
						
						 
						
						
						
						
					 
					
						2016-09-26 12:50:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1ebba3ee26 
					 
					
						
						
							
							Merge pull request  #529  from chagara/develop  
						
						 
						
						... 
						
						
						
						Added centos/rhel installation 
						
						
					 
					
						2016-09-26 12:05:19 -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 
							
						 
					 
					
						
						
							
						
						ca6c62facd 
					 
					
						
						
							
							Custom fields documentation tweaks  
						
						 
						
						
						
						
					 
					
						2016-09-12 10:30:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chagara 
							
						 
					 
					
						
						
							
						
						af519b93b7 
					 
					
						
						
							
							added more changes for centos/rhel installation  
						
						 
						
						
						
						
					 
					
						2016-09-02 16:54:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chagara 
							
						 
					 
					
						
						
							
						
						2213e3e0cf 
					 
					
						
						
							
							added centos/rhel installation on netbox.md postgresql.md and web-server.md  
						
						 
						
						
						
						
					 
					
						2016-09-02 16:38:58 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						25f1fcc6cb 
					 
					
						
						
							
							Updated docs to add URL custom field type  
						
						 
						
						
						
						
					 
					
						2016-08-24 09:42:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						1d6299622b 
					 
					
						
						
							
							Documentation and cleanup  
						
						 
						
						
						
						
					 
					
						2016-08-18 14:23:28 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6f12297dcf 
					 
					
						
						
							
							Fixes   #441 : Added openssl-devel to list of dependencies  
						
						 
						
						
						
						
					 
					
						2016-08-10 22:37:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3a018888c8 
					 
					
						
						
							
							Updated docs for new features  
						
						 
						
						
						
						
					 
					
						2016-08-10 14:09:38 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						474b19d927 
					 
					
						
						
							
							We have a logo!  
						
						 
						
						
						
						
					 
					
						2016-08-09 14:57:14 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bc9158a74f 
					 
					
						
						
							
							Closes   #412 : Tenant group assignment is no longer mandatory  
						
						 
						
						
						
						
					 
					
						2016-08-02 16:04:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b73f980eb2 
					 
					
						
						
							
							Closes   #176 : Added initial_data fixtures for new installs  
						
						 
						
						
						
						
					 
					
						2016-08-01 12:29:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fa2ccc1c18 
					 
					
						
						
							
							Initial multitenancy implementation  
						
						 
						
						
						
						
					 
					
						2016-07-26 14:58:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joachim Tingvold 
							
						 
					 
					
						
						
							
						
						deda796e42 
					 
					
						
						
							
							Triple -> single ticks + grammar.  
						
						 
						
						
						
						
					 
					
						2016-07-22 17:41:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joachim Tingvold 
							
						 
					 
					
						
						
							
						
						55ab720695 
					 
					
						
						
							
							Be more specific in the documentation regarding ALLOWED_HOSTS.  
						
						 
						
						
						
						
					 
					
						2016-07-21 21:05:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f44b20bbda 
					 
					
						
						
							
							Fixed old links in the documentation  
						
						 
						
						
						
						
					 
					
						2016-07-21 12:27:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4a00971d44 
					 
					
						
						
							
							Fixes   #43 : Introduce toggle to enforce unique IP space per VRF  
						
						 
						
						
						
						
					 
					
						2016-07-14 16:13:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f6bd1f0c48 
					 
					
						
						
							
							Make the HA warning re: SECRET_KEY a note  
						
						 
						
						
						
						
					 
					
						2016-07-14 14:03:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								brandon whitehead 
							
						 
					 
					
						
						
							
						
						9e4aa9c056 
					 
					
						
						
							
							Updated SECRET_KEY instructions for HA installs. Issue 295  
						
						 
						
						
						
						
					 
					
						2016-07-14 12:33:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						96b496ffa8 
					 
					
						
						
							
							Updated documentation to include banner settings  
						
						 
						
						
						
						
					 
					
						2016-07-13 11:24:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f1b6f0cfee 
					 
					
						
						
							
							Fixes   #285 : Added PREFER_IPV4 configuration setting  
						
						 
						
						
						
						
					 
					
						2016-07-13 11:16:09 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b60f964835 
					 
					
						
						
							
							Fixes   #272 : Added a step to copy the gunicorn config  
						
						 
						
						
						
						
					 
					
						2016-07-12 16:57:00 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Rossen 
							
						 
					 
					
						
						
							
						
						876361c0b2 
					 
					
						
						
							
							Update netbox.md  
						
						 
						
						... 
						
						
						
						Added libpq-dev as a dependency so the pip install of requirements.txt will complete. 
						
						
					 
					
						2016-07-11 08:55:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						40173b4f8e 
					 
					
						
						
							
							Added "What NetBox isn't" section do intro doc  
						
						 
						
						
						
						
					 
					
						2016-07-09 11:51:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4c354277ec 
					 
					
						
						
							
							Enabled LDAP authentication  
						
						 
						
						
						
						
					 
					
						2016-07-08 17:09:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b8c5366c3e 
					 
					
						
						
							
							Split configuration doc into two sections  
						
						 
						
						
						
						
					 
					
						2016-07-08 16:25:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						68515b9d46 
					 
					
						
						
							
							Merge pull request  #203  from dinoocch/ldap-docs  
						
						 
						
						... 
						
						
						
						Add LDAP Authentication Documentation 
						
						
					 
					
						2016-07-08 16:08:07 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c948682370 
					 
					
						
						
							
							Removed TOC elements  
						
						 
						
						
						
						
					 
					
						2016-07-08 16:05:14 -04:00