RomanNum3ral
/
netbox
mirror of https://github.com/netbox-community/netbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,604 Commits 37 Branches 383 Tags 257 MiB
Commit Graph

14604 Commits

Author SHA1 Message Date
Jeremy Stretch 4b7af8d3b4 Merge pull request #954 from psr/develop 
Force Unix line endings on shell scripts
 2017-03-13 11:35:05 -04:00
Jeremy Stretch f3fd82a24a Allow assigning child devices to rackless parents 2017-03-13 11:31:28 -04:00
Jeremy Stretch cd97b2fb96 Fix parent device position display 2017-03-13 11:25:06 -04:00
Jeremy Stretch f661c233be Fixes #950: Fix site_id error on child device import 2017-03-13 11:18:33 -04:00
Jeremy Stretch 6a2a2d5d11 Fixes #957: Correct device site filter count to include unracked devices 2017-03-13 10:13:04 -04:00
Jeremy Stretch 87ff433ef8 Fixes #956: Correct bug affecting unnamed rackless devices 2017-03-13 10:06:32 -04:00
Jeremy Stretch 9e4e3a8dfa Updated API docs 2017-03-13 10:00:13 -04:00
Jeremy Stretch 4d4441217f APIRootView tweaks 2017-03-09 15:18:50 -05:00
Jeremy Stretch 7e51ca9912 Provided a root API view 2017-03-09 15:05:01 -05:00
Jeremy Stretch 94a29be415 Removed deprecated GraphListView 2017-03-09 14:28:52 -05:00
Jeremy Stretch 9dfda83946 Closes #855: Added an API endpoint for recent activity 2017-03-09 14:26:39 -05:00
Jeremy Stretch 41826fc3cb Fixed serialization of CustomFieldChoices 2017-03-09 13:50:30 -05:00
Jeremy Stretch 0ed13f6943 Removed browsable API login/logout 2017-03-09 13:38:15 -05:00
Jeremy Stretch 6c2ed1be22 Standardized API URL definitions 2017-03-09 13:24:02 -05:00
Jeremy Stretch ddec424429 Replaced RelatedConnectionsView with views.ConnectedDeviceViewSet 2017-03-09 12:18:53 -05:00
Peter Russell d68b34cefe Force Unix line endings on shell scripts 
When following the quickstart docker instructions on Windows (using
Docker for Windows), an error is encountered when running the netbox
container. This is caused by git converting the line endings of the
docker-entrypoint.sh script to Windows format, which are then copied
into the container image.

By setting .gitattributes, we force LF rather than CRLF line endings on
shell scripts on Windows. Other files are left as is.
 2017-03-09 16:20:32 +00:00
Jeremy Stretch 7e6d061646 Converted GetSessionKey and RSAKeyGeneratorView to ViewSets 2017-03-08 17:57:51 -05:00
Jeremy Stretch c19725506d Cleanup 2017-03-08 16:30:32 -05:00
Jeremy Stretch a6ceaf8d96 Moved custom field serializers to their own module to avoid circular dependency 2017-03-08 16:18:41 -05:00
Jeremy Stretch f43fbffdf7 Moved TopologyMaps from DCIM to extras 2017-03-08 16:12:14 -05:00
Jeremy Stretch 68c099a2af Merge branch 'develop' into api2 
Conflicts:
	netbox/netbox/settings.py
 2017-03-08 15:18:32 -05:00
Jeremy Stretch 70a05b4280 Post-release version bump 2017-03-08 14:45:23 -05:00
Jeremy Stretch 097e0f38ff Merge pull request #949 from digitalocean/develop 
Release v1.9.1
 2017-03-08 14:40:16 -05:00
Jeremy Stretch 094974d417 Release v1.9.1 2017-03-08 14:38:24 -05:00
Jeremy Stretch d89314a559 Fixes #943: Child prefixes missing on Python 3 2017-03-08 14:10:27 -05:00
Jeremy Stretch 086340540a Fixes #948: Region name should be hyperlinked to site list 2017-03-08 12:04:50 -05:00
Jeremy Stretch ed83b1d9e9 Closes #946: Disregard mask length when filtering IP addresses by a parent prefix 2017-03-08 11:59:24 -05:00
Jeremy Stretch 4f6d2a8b71 Finished user control panel for tokens 2017-03-08 11:34:47 -05:00
Jeremy Stretch d58a8ebba0 Initial work on user control panel for tokens 2017-03-07 23:30:53 -05:00
Jeremy Stretch 6be465fe9b Addded is_expired property to Token 2017-03-07 23:30:31 -05:00
Jeremy Stretch 26225aff57 Shorten key length to 20 bytes 2017-03-07 22:56:29 -05:00
Jeremy Stretch fd55360672 Suppress default permissions for Token model 2017-03-07 22:40:05 -05:00
Jeremy Stretch 4e766c7c3b Closes #945: Display the current user in the nav menu 2017-03-07 22:27:46 -05:00
Jeremy Stretch 0b10d98e0b Initial work on token authentication 2017-03-07 17:17:39 -05:00
Jeremy Stretch be0a3fb1f2 Corrected merge conflict 2017-03-07 16:55:49 -05:00
Jeremy Stretch 02e89d77bb Merge branch 'develop' into api2 
Conflicts:
	netbox/dcim/api/views.py
 2017-03-07 14:08:06 -05:00
Jeremy Stretch 4b753b1610 Fixes #944: Correct console and power connection form behavior 2017-03-07 13:32:48 -05:00
Jeremy Stretch f8381628d4 Fixes #941: Corrected old references to rack.site on Device 2017-03-06 10:23:24 -05:00
Jeremy Stretch d8f41f67c9 Post-release version bump 2017-03-03 11:28:27 -05:00
Jeremy Stretch ce26b566a4 Merge pull request #939 from digitalocean/develop 
Release v1.9.0-r1
 2017-03-03 11:28:02 -05:00
Jeremy Stretch ee2d0b963d Release v1.9.0-r1 2017-03-03 11:26:31 -05:00
Jeremy Stretch f051c0e564 Fixes #935: Fix form validation error when connecting an interface using live search 2017-03-03 11:19:19 -05:00
Jeremy Stretch 03d3bbcddb Fixes #938: Provider view yields an error if one or more circuits is assigned to a tenant 2017-03-03 10:47:16 -05:00
Jeremy Stretch 06cafb09b3 Fixes #937: Region assignment should be optional when creating a site 2017-03-03 10:44:07 -05:00
Jeremy Stretch a7a7b956b1 Enable API versioning 2017-03-02 16:20:16 -05:00
Jeremy Stretch 9b39ba169c 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 4670929953 Added GitHub issue/PR templates; updated CONTRIBUTING policy 2017-03-02 15:30:14 -05:00
Jeremy Stretch 366e2e7a94 Post-release version bump 2017-03-02 13:30:45 -05:00
Jeremy Stretch 0e14bc1e02 Merge pull request #933 from digitalocean/develop 
Release v1.9.0
 2017-03-02 13:27:10 -05:00
Jeremy Stretch e5f05ca9be Release v1.9.0 2017-03-02 13:22:29 -05:00