Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a598f0e632 
					 
					
						
						
							
							Initial work on  #655 : CSV import headers  
						
						
						
						
					 
					
						2017-05-31 17:40:11 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f21c6bca00 
					 
					
						
						
							
							Import unicode_literals  
						
						
						
						
					 
					
						2017-05-24 11:33:11 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fb85867d72 
					 
					
						
						
							
							Converted all object views to class-based views  
						
						
						
						
					 
					
						2017-05-18 17:00:57 -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 
							
						 
					 
					
						
						
							
						
						f70f0f8d62 
					 
					
						
						
							
							Improved handling of return_url for object edit/delete views; removed manual definitions of initial data fields  
						
						
						
						
					 
					
						2017-04-13 13:11:23 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d98e9e1838 
					 
					
						
						
							
							Resolved RemovedInDjango20Warning deprecation warnings  
						
						
						
						
					 
					
						2017-04-05 14:40:25 -04: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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						52420945b2 
					 
					
						
						
							
							Standardized naming of return_url for all object views  
						
						
						
						
					 
					
						2017-01-23 14:07:26 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						39d083eae7 
					 
					
						
						
							
							Re-implemented method for bulk editing/deleting all objects within a filtered queryset  
						
						
						
						
					 
					
						2017-01-20 16:42:11 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						28a9307f9f 
					 
					
						
						
							
							Deprecated use_obj_view in favor of get_return_url()  
						
						
						
						
					 
					
						2017-01-18 14:34:17 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3eb969de0c 
					 
					
						
						
							
							Standardized the use of return_url for ObjectDeleteView  
						
						
						
						
					 
					
						2017-01-18 13:30:19 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5035a9567b 
					 
					
						
						
							
							Fixes   #729 : Corrected cancellation links when editing secondary objects  
						
						
						
						
					 
					
						2016-12-08 12:20:45 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7d879bb0dc 
					 
					
						
						
							
							Added bulk editing capability for custom fields  
						
						
						
						
					 
					
						2016-08-16 14:57:04 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						78c3b25f0a 
					 
					
						
						
							
							Fixes   #467 : Include prefixes and IPs which inherit tenancy from their VRF in tenant stats  
						
						
						
						
					 
					
						2016-08-15 16:11:17 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						72690bfd0a 
					 
					
						
						
							
							Potential fix for  #419 : Ditch annotation in favor of discrete queries to gather Tenant stats  
						
						
						
						
					 
					
						2016-08-03 14:24:09 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bc9158a74f 
					 
					
						
						
							
							Closes   #412 : Tenant group assignment is no longer mandatory  
						
						
						
						
					 
					
						2016-08-02 16:04:25 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e6c06b39e8 
					 
					
						
						
							
							Adds tenant assignment to Prefix and IPAddress objects  
						
						
						
						
					 
					
						2016-07-28 13:50:46 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e4960873f3 
					 
					
						
						
							
							Added stats to tenant view  
						
						
						
						
					 
					
						2016-07-27 11:56:47 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						fa2ccc1c18 
					 
					
						
						
							
							Initial multitenancy implementation  
						
						
						
						
					 
					
						2016-07-26 14:58:37 -04:00