Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2ac60bdf48 
					 
					
						
						
							
							Merge branch 'develop' into develop-2.5 (v2.4.4 release)  
						
						 
						
						
						
						
					 
					
						2018-08-22 12:10:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f2d9a3e0a1 
					 
					
						
						
							
							Added note about CHANGELOG to release checklist  
						
						 
						
						
						
						
					 
					
						2018-08-22 11:50:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b917e8d3b0 
					 
					
						
						
							
							#2376 : Add libapache2-mod-wsgi-py3 to CentOS installation section  
						
						 
						
						
						
						
					 
					
						2018-08-22 11:46:13 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jimmy Taylor 
							
						 
					 
					
						
						
							
						
						118b8db209 
					 
					
						
						
							
							Fixed typo for supervisorctl  
						
						 
						
						
						
						
					 
					
						2018-08-21 08:28:23 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ac546a9711 
					 
					
						
						
							
							Closes   #2000 : Remove support for Python 2  
						
						 
						
						
						
						
					 
					
						2018-08-14 11:48:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3e0a7e7f8a 
					 
					
						
						
							
							Added tip about exlcuding the changelog when exporting the database  
						
						 
						
						
						
						
					 
					
						2018-08-08 09:04:48 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						78b8a582f8 
					 
					
						
						
							
							Added release checklist to development docs  
						
						 
						
						
						
						
					 
					
						2018-08-02 11:53:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0b971aaf84 
					 
					
						
						
							
							Extended developer docs  
						
						 
						
						
						
						
					 
					
						2018-08-01 12:38:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d6ce4fc9f3 
					 
					
						
						
							
							Docs fixes  
						
						 
						
						
						
						
					 
					
						2018-07-30 17:19:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9876a2efcd 
					 
					
						
						
							
							Added a style section  
						
						 
						
						
						
						
					 
					
						2018-07-30 14:16:45 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						674a0d481e 
					 
					
						
						
							
							Additional documentation cleanup  
						
						 
						
						
						
						
					 
					
						2018-07-27 13:42:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9eb433a4ef 
					 
					
						
						
							
							Added instructions for replicating NetBox  
						
						 
						
						
						
						
					 
					
						2018-07-20 15:26:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						688c421c55 
					 
					
						
						
							
							Tweaked Python3 guide to be less disruptive  
						
						 
						
						
						
						
					 
					
						2018-07-18 17:40:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d0349f00ad 
					 
					
						
						
							
							Misc cleanup  
						
						 
						
						
						
						
					 
					
						2018-07-18 09:36:05 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d77214fef6 
					 
					
						
						
							
							Started v2.4 documentation refresh  
						
						 
						
						
						
						
					 
					
						2018-07-17 17:23:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						277197edd4 
					 
					
						
						
							
							Split webhooks documentation into the data model and installation sections  
						
						 
						
						
						
						
					 
					
						2018-07-16 16:21:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						69ddf046b0 
					 
					
						
						
							
							Quick docs update (more to come prior to the v2.4 release)  
						
						 
						
						
						
						
					 
					
						2018-07-16 14:53:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d7e40de9da 
					 
					
						
						
							
							Merged v2.3.6  
						
						 
						
						
						
						
					 
					
						2018-07-16 12:03:32 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mmahacek 
							
						 
					 
					
						
						
							
						
						a26d1812c2 
					 
					
						
						
							
							Update sample report  
						
						 
						
						... 
						
						
						
						Reference to STATUS_ACTIVE does not work in the current version.  Needs to be changed to DEVICE_STATUS_ACTIVE. 
						
						
					 
					
						2018-07-11 11:52:33 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						77518eaf69 
					 
					
						
						
							
							Merge pull request  #2218  from alexjhart/develop  
						
						 
						
						... 
						
						
						
						More verbose LDAP nested groups documentation 
						
						
					 
					
						2018-07-05 13:11:56 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						4bd36f0ea9 
					 
					
						
						
							
							Closes   #2062 : Added a note about parent/child device type role  
						
						 
						
						
						
						
					 
					
						2018-07-05 12:02:32 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b19bf791a4 
					 
					
						
						
							
							Closes   #2138 : Added documentation for filtering on custom fields  
						
						 
						
						
						
						
					 
					
						2018-07-05 11:58:07 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Hart 
							
						 
					 
					
						
						
							
						
						f70b7cab21 
					 
					
						
						
							
							More verbose LDAP nested groups documentation  
						
						 
						
						
						
						
					 
					
						2018-07-03 15:53:58 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						104bd1b45f 
					 
					
						
						
							
							Closes   #2211 : Removed Python 2 instructions from the installation docs  
						
						 
						
						
						
						
					 
					
						2018-07-02 16:33:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3bdfe9c249 
					 
					
						
						
							
							Implemented changelog retention setting, automatic purging  
						
						 
						
						
						
						
					 
					
						2018-06-22 16:18:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						33add12069 
					 
					
						
						
							
							Merge branch 'develop' into develop-2.4  
						
						 
						
						
						
						
					 
					
						2018-06-07 16:23:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Layher 
							
						 
					 
					
						
						
							
						
						e3c3e54cbb 
					 
					
						
						
							
							docs: fix circuits typo  
						
						 
						
						
						
						
					 
					
						2018-06-01 16:04:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt Layher 
							
						 
					 
					
						
						
							
						
						a61473dd98 
					 
					
						
						
							
							docs: fix typos and markdownlint warnings in webhooks docs  
						
						 
						
						
						
						
					 
					
						2018-06-01 15:07:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						efa118c3c8 
					 
					
						
						
							
							Tweaked webhooks and Redis settings  
						
						 
						
						
						
						
					 
					
						2018-05-30 14:51:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Anderson 
							
						 
					 
					
						
						
							
						
						836478c166 
					 
					
						
						
							
							Implements  #81  - webhook event backend ( #1640 )  
						
						 
						
						... 
						
						
						
						* merge branch develop
* bugfix, signals for virtualization's class wasn't correctly defined
* updated webhooks for 2.4 and cleanup
* updated docs to cover changes to supervisor config
* review changes and further cleanup
* updated redis connection settings
* cleanup settings 
						
						
					 
					
						2018-05-30 11:19:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Reimann, Timo 
							
						 
					 
					
						
						
							
						
						131436fc20 
					 
					
						
						
							
							Changed upgrading documentation for ease of use  
						
						 
						
						
						
						
					 
					
						2018-05-22 16:20:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						966c188977 
					 
					
						
						
							
							Merge pull request  #1939  from dougthor42/patch-1  
						
						 
						
						... 
						
						
						
						Add note about copying reports to `upgrading.md` 
						
						
					 
					
						2018-05-22 16:16:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6a4d17b8a5 
					 
					
						
						
							
							Merge pull request  #1985  from lampwins/docs/apache-header  
						
						 
						
						... 
						
						
						
						added X-Forwarded-Proto header to apache config 
						
						
					 
					
						2018-03-22 11:43:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Anderson 
							
						 
					 
					
						
						
							
						
						1c5239a4d0 
					 
					
						
						
							
							added X-Forwarded-Proto header to apache config  
						
						 
						
						
						
						
					 
					
						2018-03-22 10:51:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Douglas Thor 
							
						 
					 
					
						
						
							
						
						8d9543cb6a 
					 
					
						
						
							
							Add note about copying reports to upgrading.md  
						
						 
						
						... 
						
						
						
						The `upgrading.md` file does not mention reports. If the user created reports in the old version's default directory (`./netbox/reports`), then the reports will not be transferred to the new version. 
						
						
					 
					
						2018-03-01 15:05:51 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						36de9f10d6 
					 
					
						
						
							
							Closes   #1918 : Add note about copying media directory to upgrade doc  
						
						 
						
						
						
						
					 
					
						2018-02-27 15:54:25 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						22f17a1424 
					 
					
						
						
							
							Merge branch 'develop-2.3' into develop  
						
						 
						
						
						
						
					 
					
						2018-02-26 14:14:47 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						972f9be291 
					 
					
						
						
							
							Formatting correction  
						
						 
						
						
						
						
					 
					
						2018-02-26 13:20:28 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8b33b888b2 
					 
					
						
						
							
							Merge branch 'develop' into develop-2.3  
						
						 
						
						
						
						
					 
					
						2018-02-21 16:16:20 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Eismeier 
							
						 
					 
					
						
						
							
						
						e6bcc4a3fe 
					 
					
						
						
							
							Propose fix typos ( #1897 )  
						
						 
						
						
						
						
					 
					
						2018-02-21 12:39:29 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f2c9135b96 
					 
					
						
						
							
							Merge branch 'develop' into develop-2.3  
						
						 
						
						
						
						
					 
					
						2018-01-25 14:21:25 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3bcc1429dd 
					 
					
						
						
							
							Merge pull request  #1833  from lampwins/api-docs  
						
						 
						
						... 
						
						
						
						added statement and example for using ForeignKey ID's in write actions in api docs 
						
						
					 
					
						2018-01-22 16:57:08 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9a6a479452 
					 
					
						
						
							
							Added VirtualChassis to the docs  
						
						 
						
						
						
						
					 
					
						2018-01-22 16:54:39 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Anderson 
							
						 
					 
					
						
						
							
						
						6b50755a5a 
					 
					
						
						
							
							fixed duplicate api docs example and grammar  
						
						 
						
						
						
						
					 
					
						2018-01-22 16:26:51 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						53998e0fff 
					 
					
						
						
							
							Closes   #1828 : Added warning about media directory permissions  
						
						 
						
						
						
						
					 
					
						2018-01-22 16:04:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								John Anderson 
							
						 
					 
					
						
						
							
						
						7341ae087c 
					 
					
						
						
							
							added statement and exaple for using ForeignKey ID's in write actions  
						
						 
						
						
						
						
					 
					
						2018-01-22 10:43:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Adrian Frühwirth 
							
						 
					 
					
						
						
							
						
						935da0d51f 
					 
					
						
						
							
							Fixes   #1802 : Typo in ldap.md  
						
						 
						
						
						
						
					 
					
						2017-12-29 13:29:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ac71416eb9 
					 
					
						
						
							
							Closes   #1775 : Added instructions for enabling STARTTLS for LDAP authentication  
						
						 
						
						
						
						
					 
					
						2017-12-20 14:48:42 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						df141a48d9 
					 
					
						
						
							
							Fixed typo  
						
						 
						
						
						
						
					 
					
						2017-12-06 12:17:04 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5be4b0c4fd 
					 
					
						
						
							
							Closes   #1631 : Added a post_run method to the Report class  
						
						 
						
						
						
						
					 
					
						2017-10-27 10:02:27 -04:00