mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code
383 Commits 19 Branches 297 Tags
Commit Graph

383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Stretch
c0ab9f70dc Standardized console/power/interface display 2016-07-06 14:40:40 -04:00
Jeremy Stretch
cc17604220 Force 48-bit MAC format for proper error messages during validation 2016-07-06 14:22:34 -04:00
Jeremy Stretch
9793b406e9 Merge pull request #170 from peelman/add-mac-address-to-interface 
Add mac address to interface
 2016-07-06 13:38:46 -04:00
Nick Peelman
7a2f6eaf34 Regenerate migration 2016-07-06 13:22:41 -04:00
Nick Peelman
dc847ce4d6 Fix connected interface template rendering... 2016-07-06 13:21:40 -04:00
Nick Peelman
578013fdd2 Fix PEP8 compliance...(again) 2016-07-06 13:21:40 -04:00
Nick Peelman
9f75d5bd23 Fix PEP8 compliance... 2016-07-06 13:21:40 -04:00
Nick Peelman
a6d41c95b8 Remove external macaddress package dependency 2016-07-06 13:21:40 -04:00
Nick Peelman
9da4c28cd5 Tests pass now 2016-07-06 13:21:40 -04:00
Nick Peelman
0ce92cb2ee Add fixtures for mac addresses. add mac addresses to api tests 2016-07-06 13:21:40 -04:00
Nick Peelman
6fb530b75d Relocate Add Interface button to match the style used in the rest of the view 2016-07-06 13:21:40 -04:00
Nick Peelman
5034b836ea Add MAC address field to interfaces 2016-07-06 13:21:40 -04:00
Jeremy Stretch
35f3355cfe Merge pull request #207 from ryanmerolle/develop 
Updated Upgrade Instructions & apt-get install
 2016-07-06 12:48:17 -04:00
ryanmerolle
65514102cd Updated Upgrade Instructions & apt-get install 
I accidentally submitted my last 2 changes to master instead of develop.  This corrects the mistake.
 2016-07-06 12:26:45 -04:00
Jeremy Stretch
5e9090a03a Revert "v1.1.0 release" 
This reverts commit e8b8b015bb0ab6fb7e6fd5916901df1f6cdcb298.
 2016-07-05 18:12:05 -04:00
Jeremy Stretch
60b48f9e4e Merge branch 'master' of github.com:digitalocean/netbox into develop 2016-07-05 18:00:35 -04:00
Jeremy Stretch
e8b8b015bb v1.1.0 release 2016-07-05 18:00:12 -04:00
Jeremy Stretch
7021ce2ecf Merge branch 'develop' of github.com:digitalocean/netbox into develop 2016-07-05 17:36:44 -04:00
Jeremy Stretch
58e23a9773 Merge branch 'devicetype-fixes' into develop 2016-07-05 17:36:27 -04:00
Jeremy Stretch
064582f6c5 Improve DeviceType display (credit to @peelman); add validation for DeviceType components 2016-07-05 17:30:16 -04:00
Jeremy Stretch
75789fc956 Merge pull request #188 from ChristianKniep/no_local_mounts 
No local mounts
 2016-07-05 16:49:12 -04:00
Jeremy Stretch
1c159968bf Merge pull request #184 from koep/develop 
Add vi swap files to gitignore
 2016-07-05 16:47:03 -04:00
Jeremy Stretch
1b5231c188 Merge pull request #197 from digitalocean/device-bays 
Device bays
 2016-07-05 16:44:06 -04:00
Jeremy Stretch
dc3cbfcdd4 Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField 2016-07-05 16:39:43 -04:00
Jeremy Stretch
ee65d3f406 Fix DeviceBay inclusion in admin UI 2016-07-05 16:35:44 -04:00
Jeremy Stretch
fc9aa03dc1 Improved device bay documentation 2016-07-05 16:20:33 -04:00
Jeremy Stretch
34c332d165 Updated documentation to include device bays 2016-07-05 16:02:11 -04:00
Jeremy Stretch
c57e63ff00 Fixed API tests 2016-07-05 15:50:21 -04:00
Jeremy Stretch
14502123d8 Minor version increment for new feature (device bays) 2016-07-05 15:34:12 -04:00
Jeremy Stretch
80c8d2f0c0 Added parent_device to DeviceSerializer 2016-07-05 15:32:16 -04:00
Nick Peelman
acccdc09f2 Fixing dumb indent mistake... 2016-07-05 15:14:03 -04:00
Nick Peelman
20e3ef9a04 make device type network/console/power tables show based on device type settings 2016-07-05 15:00:25 -04:00
Nick Peelman
db9b0dcaef Fixing a nesting/logic issue on device type edit/delete buttons 2016-07-05 14:59:29 -04:00
Jeremy Stretch
97fbfeecc3 Extended API to include DeviceBays 2016-07-05 13:43:19 -04:00
Jeremy Stretch
7eae636562 Added DeviceType to device bays table 2016-07-05 13:42:14 -04:00
Christian Kniep
af87345637 remove debug port exposure for netbox 2016-07-04 10:51:52 +02:00
Christian Kniep
85c55cd27f use volumes of netbox, holding default config 2016-07-04 10:42:24 +02:00
Christian Kniep
6e1f8d3503 put config into netbox image 2016-07-04 10:42:01 +02:00
Christian Koep
60cc88bcde Add vi swap files to gitignore 2016-07-02 17:30:12 +02:00
Jeremy Stretch
8b7d86df5a Merge branch 'develop' of github.com:digitalocean/netbox into develop 2016-07-01 18:20:27 -04:00
Jeremy Stretch
a5066a905e Added a note to CONTRIBUTING about opening an issue before submitting a PR 2016-07-01 18:20:06 -04:00
Jeremy Stretch
aabe641d63 Merge pull request #107 from koep/develop 
Add option to dockerize netbox
 2016-07-01 18:02:33 -04:00
Jeremy Stretch
06a38d836c Merge branch 'device-bays' of github.com:digitalocean/netbox into device-bays 
Conflicts:
	netbox/dcim/tables.py
 2016-07-01 17:38:21 -04:00
Jeremy Stretch
0123dbcf5f Initial work on #91: Support for subdevices 2016-07-01 17:34:47 -04:00
Jeremy Stretch
35c5423127 Merge pull request #177 from digitalocean/upgrade-sudo 
Optionally use sudo if not running upgrade.sh as root
 2016-07-01 17:25:59 -04:00
Jeremy Stretch
7682b66034 Merge pull request #179 from peelman/develop 
Fix interface connections list view glitch
 2016-07-01 17:23:20 -04:00
Jeremy Stretch
067f22e444 Initial work on #91: Support for subdevices 2016-07-01 17:12:43 -04:00
Nick Peelman
f96171f529 Fix interface connections list view glitch 2016-07-01 13:55:44 -04:00
Matt Layher
49f06cfeb2 Optionally use sudo if not running upgrade.sh as root 2016-07-01 13:21:51 -04:00
Jeremy Stretch
1bb2a3f152 Fixes #169: Fallback to cancel_url if object is missing get_absolute_url() 2016-07-01 10:25:13 -04:00