Commit Graph

12 Commits

Author SHA1 Message Date
Jeremy Stretch
5a7630e560 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
	netbox/dcim/tables.py
	requirements.txt
2017-03-02 16:01:25 -05:00
Jeremy Stretch
4a244847c2 Documentation refresh 2017-03-02 13:21:56 -05:00
Jeremy Stretch
691ea87444 Merged develop 2017-02-28 16:10:53 -05:00
Jeremy Stretch
b92f7aa8f1 Implemented recursive regions with django-mptt 2017-02-28 14:15:15 -05:00
Jeremy Stretch
26263f5bcb Initial work on regions 2017-02-28 12:11:43 -05:00
Jasperswaagman
45c56dc54c Typo 2017-02-21 15:20:42 +01:00
Jeremy Stretch
050b47073d Updated docs for new features 2016-08-10 14:09:38 -04:00
Jeremy Stretch
7a17e49662 Removed TOC elements 2016-07-08 16:05:14 -04:00
Jeremy Stretch
45bad94ef6 Structured docs layout 2016-07-08 12:55:57 -04:00
Jeremy Stretch
fbb3911346 Added documentation renderer 2016-05-24 12:38:06 -04:00
Jeremy Stretch
3f279dc58b Fixed typo 2016-03-21 10:45:33 -04:00
Jeremy Stretch
27b289ee3b Initial push to public repo 2016-03-01 11:23:03 -05:00