Matt Layher
ba83f4dcee
Merge remote-tracking branch 'origin/master' into develop
2016-07-07 13:01:24 -04:00
Jeremy Stretch
ba74be0af5
Dev version bump
2016-07-07 12:54:25 -04:00
Jeremy Stretch
7befef5586
Merge branch 'develop'
2016-07-07 12:49:56 -04:00
Jeremy Stretch
ec2626aa09
Resolved version conflict
2016-07-07 12:49:35 -04:00
Jeremy Stretch
126dea9ebf
Version bump for v1.1.0
2016-07-07 12:27:27 -04:00
Jeremy Stretch
5c6e3905b8
Move membership evaluation to SecretRole
2016-07-07 12:07:02 -04:00
Gelob
eb2af9141b
Banner/MOTD Support
2016-07-06 23:37:04 -05:00
Jeremy Stretch
3c71b709ba
Clarified secret role permissions
2016-07-06 17:45:08 -04:00
Jeremy Stretch
425776865a
Grant superusers permission to decrypt all secrets
2016-07-06 17:40:32 -04:00
Jeremy Stretch
8d837979ff
#68 : Improved permissions-related error handling
2016-07-06 17:22:10 -04:00
Jeremy Stretch
277e8f902f
Optimize database query for user actions list
2016-07-06 16:36:07 -04:00
Jeremy Stretch
8874edad05
Fixes #214 : Suppress status message if updated_count has not been provided
2016-07-06 16:25:15 -04:00
Jeremy Stretch
5d5a204d5f
Cleaned up 'not connected' text
2016-07-06 16:01:18 -04:00
Jeremy Stretch
dac831048d
Merge pull request #210 from peelman/develop
...
critical connections placeholder should span 5 rows now
2016-07-06 15:57:04 -04:00
Jeremy Stretch
8909a76200
Fixes #209 : Read pk list from POST instead of form
2016-07-06 15:55:42 -04:00
Nick Peelman
6551f47323
critical connections placeholder should span 5 rows now
2016-07-06 15:46:00 -04:00
Jeremy Stretch
7a19c699fb
Standardized console/power/interface display
2016-07-06 14:40:40 -04:00
Jeremy Stretch
24b60fc1d3
Force 48-bit MAC format for proper error messages during validation
2016-07-06 14:22:34 -04:00
Jeremy Stretch
b8112483e5
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
59128bc7ab
Regenerate migration
2016-07-06 13:22:41 -04:00
Nick Peelman
aed0f2f2cb
Fix connected interface template rendering...
2016-07-06 13:21:40 -04:00
Nick Peelman
ed64efa89e
Fix PEP8 compliance...(again)
2016-07-06 13:21:40 -04:00
Nick Peelman
edfb17ca16
Fix PEP8 compliance...
2016-07-06 13:21:40 -04:00
Nick Peelman
8658b497d7
Remove external macaddress package dependency
2016-07-06 13:21:40 -04:00
Nick Peelman
45ed851277
Tests pass now
2016-07-06 13:21:40 -04:00
Nick Peelman
8dd76556b2
Add fixtures for mac addresses. add mac addresses to api tests
2016-07-06 13:21:40 -04:00
Nick Peelman
3ceb5261b7
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
e7683eb833
Add MAC address field to interfaces
2016-07-06 13:21:40 -04:00
Jeremy Stretch
7c55a32b77
Merge pull request #207 from ryanmerolle/develop
...
Updated Upgrade Instructions & apt-get install
2016-07-06 12:48:17 -04:00
ryanmerolle
16674e3302
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
b1143a4c12
Merge pull request #205 from ryanmerolle/patch-2
...
Updated Upgrade Instructions
2016-07-06 11:50:01 -04:00
ryanmerolle
1f32e6c611
Updated Upgrade Instructions
...
Streamlined update process for newer users like myself. Now includes exact instructions for downloading latest release or using git.
2016-07-06 10:10:57 -04:00
dinoocch
958f32e266
Add LDAP Authentication Documentation
...
Addresses #65
This commit adds documentation for installing and configuring ldap
authentication for netbox.
It may be beneficial to add settings to the configuration.py instead of
editing settings.py if this is an important feature.
2016-07-05 22:10:14 -05:00
Jeremy Stretch
b52c472e89
Fixes #199 : Moved prefix_validator from BaseIPField to IPNetworkField
2016-07-05 18:15:24 -04:00
Jeremy Stretch
e3427e9989
Revert "v1.1.0 release"
...
This reverts commit 7fb5b825f0
2016-07-05 18:12:05 -04:00
Jeremy Stretch
34cf5fd90c
Merge branch 'master' of github.com:digitalocean/netbox into develop
2016-07-05 18:00:35 -04:00
Jeremy Stretch
7fb5b825f0
v1.1.0 release
2016-07-05 18:00:12 -04:00
Jeremy Stretch
fd3459f4c1
Merge branch 'develop' of github.com:digitalocean/netbox into develop
2016-07-05 17:36:44 -04:00
Jeremy Stretch
c7bcbdc985
Merge branch 'devicetype-fixes' into develop
2016-07-05 17:36:27 -04:00
Jeremy Stretch
7d9a7d6a07
Improve DeviceType display (credit to @peelman); add validation for DeviceType components
2016-07-05 17:30:16 -04:00
Jeremy Stretch
d606266444
Merge pull request #188 from ChristianKniep/no_local_mounts
...
No local mounts
2016-07-05 16:49:12 -04:00
Jeremy Stretch
7a9785880d
Merge pull request #184 from koep/develop
...
Add vi swap files to gitignore
2016-07-05 16:47:03 -04:00
Jeremy Stretch
c250d3ae7f
Merge pull request #197 from digitalocean/device-bays
...
Device bays
2016-07-05 16:44:06 -04:00
Jeremy Stretch
f95240e5bf
Fixes #199 : Moved prefix_validator from BaseIPField to IPNetworkField
2016-07-05 16:39:43 -04:00
Jeremy Stretch
feab595601
Fix DeviceBay inclusion in admin UI
2016-07-05 16:35:44 -04:00
Jeremy Stretch
cbfef1f1a4
Improved device bay documentation
2016-07-05 16:20:33 -04:00
Jeremy Stretch
ab9e4c7c5a
Updated documentation to include device bays
2016-07-05 16:02:11 -04:00
Jeremy Stretch
53422058ae
Fixed API tests
2016-07-05 15:50:21 -04:00
Jeremy Stretch
00ac6ca645
Minor version increment for new feature (device bays)
2016-07-05 15:34:12 -04:00
Jeremy Stretch
e6ef53f138
Added parent_device to DeviceSerializer
2016-07-05 15:32:16 -04:00
