Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						66615f1a96 
					 
					
						
						
							
							Prettied things up a bit  
						
						
						
						
					 
					
						2017-03-29 16:45:25 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						a5dc91c175 
					 
					
						
						
							
							Introduced SearchTable for improved performance  
						
						
						
						
					 
					
						2017-03-29 16:05:23 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						28761fc960 
					 
					
						
						
							
							Closes   #362 : Added per_page query parameter to control pagination page length  
						
						
						
						
					 
					
						2017-03-28 15:57:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						04e09c0078 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						... 
						
						
						
						Conflicts:
	netbox/circuits/filters.py 
						
						
					 
					
						2017-03-22 09:48:41 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						05b71564d8 
					 
					
						
						
							
							Closes   #981 : Allow filtering primary objects by a given set of IDs  
						
						
						
						
					 
					
						2017-03-22 09:39:30 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						54468ab1a8 
					 
					
						
						
							
							Include the API version in responses  
						
						
						
						
					 
					
						2017-03-21 13:23:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						2bd46230be 
					 
					
						
						
							
							Converted ChoiceFieldSerializer to display an object  
						
						
						
						
					 
					
						2017-03-20 16:32:59 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						42fd14f5c0 
					 
					
						
						
							
							Introduced HttpStatusMixin to provide more detail on HTTP response status test failures  
						
						
						
						
					 
					
						2017-03-20 13:46:47 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f02dd2f439 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						
						
						
					 
					
						2017-03-17 17:06:01 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f33269e50b 
					 
					
						
						
							
							First batch of DCIM API tests  
						
						
						
						
					 
					
						2017-03-16 16:50:18 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						f4784412de 
					 
					
						
						
							
							Fixes   #964 : Fix bug when bulk editing/deleting filtered set of objects  
						
						
						
						
					 
					
						2017-03-14 15:22:08 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						33c5ea1f4e 
					 
					
						
						
							
							Fixes   #963 : Fix bug in IPv6 address range expansion  
						
						
						
						
					 
					
						2017-03-14 15:06:34 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						6be465fe9b 
					 
					
						
						
							
							Addded is_expired property to Token  
						
						
						
						
					 
					
						2017-03-07 23:30:31 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0b10d98e0b 
					 
					
						
						
							
							Initial work on token authentication  
						
						
						
						
					 
					
						2017-03-07 17:17:39 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c0152940f9 
					 
					
						
						
							
							Merged develop  
						
						
						
						
					 
					
						2017-02-28 16:10:53 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9313ba08ed 
					 
					
						
						
							
							Implemented recursive regions with django-mptt  
						
						
						
						
					 
					
						2017-02-28 14:15:15 -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 
							
						 
					 
					
						
						
							
						
						c6970e1998 
					 
					
						
						
							
							Closes   #105 : Interface groups ( #919 )  
						
						... 
						
						
						
						* Initial work on interface groups
* Simplify to a single LAG form factor
* Correct interface serializer
* Allow for bulk editing of interface LAG
* Additional LAG interface validation
* Fixed API tests 
						
						
					 
					
						2017-02-27 16:52:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0e5138d6ec 
					 
					
						
						
							
							Fixes   #872 : TypeError on bulk IP address creation (Python 3)  
						
						
						
						
					 
					
						2017-02-17 16:10:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						21281789e0 
					 
					
						
						
							
							Tweaked ChoiceFieldSerializer to display a field as (value, label)  
						
						
						
						
					 
					
						2017-02-16 14:37:21 -05: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 
							
						 
					 
					
						
						
							
						
						181539651f 
					 
					
						
						
							
							Rack reservations ( #900 )  
						
						... 
						
						
						
						* Initial work on rack reservations
* Added views for rack reservations
* Implemented ArrayFieldSelectMultiple form widget
* Implemented API endpoints for rack reservations
* Tweaked the database migration 
						
						
					 
					
						2017-02-16 13:46:58 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						b69564f5c9 
					 
					
						
						
							
							Exposed the request to ObjectEditView's alter_obj()  
						
						
						
						
					 
					
						2017-02-15 15:03:31 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7040086201 
					 
					
						
						
							
							Introduced ChoiceFieldSerializer for choice fields  
						
						
						
						
					 
					
						2017-02-09 15:50:25 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0dd857f7a2 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						
						
						
					 
					
						2017-02-01 12:33:37 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						d817990283 
					 
					
						
						
							
							Fixes   #865 : Fix server error when attempting to delete a protected object parent (Python 3)  
						
						
						
						
					 
					
						2017-02-01 12:09:59 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9905099a71 
					 
					
						
						
							
							Fixes   #854 : Check whether object still exists before attempting to resolve its URL  
						
						
						
						
					 
					
						2017-02-01 11:59:47 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						0eba5a0de3 
					 
					
						
						
							
							Fixes   #851 : Resolve encoding issues during import/export with Python 3  
						
						
						
						
					 
					
						2017-02-01 11:49:54 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8536f6c163 
					 
					
						
						
							
							Closes   #856 : Strip whitespace from fields during CSV import  
						
						
						
						
					 
					
						2017-01-31 16:54:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						bb1f97abc2 
					 
					
						
						
							
							Implemented static writable ModelSerializers for all models  
						
						
						
						
					 
					
						2017-01-31 15:35:09 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						e1cd846c9a 
					 
					
						
						
							
							Enabled creation of device components  
						
						
						
						
					 
					
						2017-01-31 12:19:41 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						78cd4481e4 
					 
					
						
						
							
							Merge branch 'develop' into api2  
						
						
						
						
					 
					
						2017-01-30 13:38:49 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						af3c9eaec1 
					 
					
						
						
							
							Fixes   #854 : Correct processing of get_return_url() in ObjectDeleteView  
						
						
						
						
					 
					
						2017-01-30 12:13:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						c0dac1383d 
					 
					
						
						
							
							Fix retrieval of model under viewsets without a statically defined queryset  
						
						
						
						
					 
					
						2017-01-27 15:12:46 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						12d263999b 
					 
					
						
						
							
							Introduced WritableSerializerMixin  
						
						
						
						
					 
					
						2017-01-27 14:36:13 -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 
						 
				 
			
				
					
						
							
							
								dav3860 
							
						 
					 
					
						
						
							
						
						b3b96e5e10 
					 
					
						
						
							
							Support for comma in interfaces and ip addresses bulk creation ( #833 )  
						
						... 
						
						
						
						* Added support for comma in interfaces and ip addresses bulk creation
* fixed PEP8 style
* removed unnecessary assertions 
						
						
					 
					
						2017-01-25 14:47:14 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						ed8fdd9292 
					 
					
						
						
							
							Fixes   #816 : Redirect back to parent prefix view after deleting child prefixes  
						
						
						
						
					 
					
						2017-01-24 09:50:51 -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 
							
						 
					 
					
						
						
							
						
						cdccc3a47f 
					 
					
						
						
							
							Ditched get_parent_url() model method in favor of overrideable get_return_url() view method  
						
						
						
						
					 
					
						2017-01-18 14:07:46 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						3eb969de0c 
					 
					
						
						
							
							Standardized the use of return_url for ObjectDeleteView  
						
						
						
						
					 
					
						2017-01-18 13:30:19 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						9ff59ab686 
					 
					
						
						
							
							Closes   #760 : Redirect user back to device view after deleting an assigned IP address  
						
						
						
						
					 
					
						2017-01-18 12:25:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						7f3b358571 
					 
					
						
						
							
							Fixes   #807 : Redirect user back to form when adding IP addresses in bulk and "create and add another" is clicked  
						
						
						
						
					 
					
						2017-01-17 15:46:43 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						52567c4ade 
					 
					
						
						
							
							Fixes   #764 : Encapsulate in double quotes values containing commas when exporting to CSV  
						
						
						
						
					 
					
						2017-01-04 10:47:00 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						8154ae3685 
					 
					
						
						
							
							Closes   #771 : Don't automatically redirect user when only one object is returned in a list  
						
						
						
						
					 
					
						2017-01-04 09:51:40 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						48e9cd6a00 
					 
					
						
						
							
							Miscellaneous cleanup and documentation  
						
						
						
						
					 
					
						2016-12-29 13:42:38 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						5716207ba6 
					 
					
						
						
							
							Simplified paginator when dealing with <=5 pages  
						
						
						
						
					 
					
						2016-12-26 15:43:48 -05:00 
						 
				 
			
				
					
						
							
							
								Jeremy Stretch 
							
						 
					 
					
						
						
							
						
						04fd197c9b 
					 
					
						
						
							
							Fixed table form rendering for django-tables2>=1.2.1  
						
						
						
						
					 
					
						2016-12-26 14:30:56 -05:00