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 Activity
7,404 Commits 19 Branches 297 Tags
b8021278017b5db7154e77b08878272ff9d9d064
Commit Graph

7404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Stretch
b9e0739f72 Fixes #228: Correct conditional inclusion of device bays 2016-07-07 13:39:54 -04:00
Matt Layher
29358a18b8 Merge remote-tracking branch 'origin/master' into develop 2016-07-07 13:01:24 -04:00
Jeremy Stretch
9c48340b9a Dev version bump 2016-07-07 12:54:25 -04:00
Jeremy Stretch
4e4996e88f Merge branch 'develop' v1.1.0 2016-07-07 12:49:56 -04:00
Jeremy Stretch
ece16200a3 Resolved version conflict 2016-07-07 12:49:35 -04:00
Jeremy Stretch
bfe8979523 Version bump for v1.1.0 2016-07-07 12:27:27 -04:00
Jeremy Stretch
7228801cb0 Move membership evaluation to SecretRole 2016-07-07 12:07:02 -04:00
Gelob
1338bf6012 Banner/MOTD Support 2016-07-06 23:37:04 -05:00
Jeremy Stretch
c19124fcac Clarified secret role permissions 2016-07-06 17:45:08 -04:00
Jeremy Stretch
edde021c85 Grant superusers permission to decrypt all secrets 2016-07-06 17:40:32 -04:00
Jeremy Stretch
966ea45050 #68: Improved permissions-related error handling 2016-07-06 17:22:10 -04:00
Jeremy Stretch
e7f21dea4b Optimize database query for user actions list 2016-07-06 16:36:07 -04:00
Jeremy Stretch
3276caa284 Fixes #214: Suppress status message if updated_count has not been provided 2016-07-06 16:25:15 -04:00
Jeremy Stretch
891a128736 Cleaned up 'not connected' text 2016-07-06 16:01:18 -04:00
Jeremy Stretch
a74ddd8527 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
24c48bece8 Fixes #209: Read pk list from POST instead of form 2016-07-06 15:55:42 -04:00
Nick Peelman
a069e92ce0 critical connections placeholder should span 5 rows now 2016-07-06 15:46:00 -04:00
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
343b65cb50 Merge pull request #205 from ryanmerolle/patch-2 
Updated Upgrade Instructions
 2016-07-06 11:50:01 -04:00
ryanmerolle
33d755d51a 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
9750da4761 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
d974cecda3 Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField v1.0.7-r1 2016-07-05 18:15:24 -04:00
Jeremy Stretch
5e9090a03a Revert "v1.1.0 release" 
This reverts commit e8b8b015bb.
 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