Commit Graph

  • b9e0739f72 Fixes #228: Correct conditional inclusion of device bays Jeremy Stretch 2016-07-07 13:39:54 -0400
  • ba83f4dcee Merge remote-tracking branch 'origin/master' into develop Matt Layher 2016-07-07 13:01:24 -0400
  • 29358a18b8 Merge remote-tracking branch 'origin/master' into develop Matt Layher 2016-07-07 13:01:24 -0400
  • ba74be0af5 Dev version bump Jeremy Stretch 2016-07-07 12:54:25 -0400
  • 9c48340b9a Dev version bump Jeremy Stretch 2016-07-07 12:54:25 -0400
  • 7befef5586 Merge branch 'develop' Jeremy Stretch 2016-07-07 12:49:56 -0400
  • 4e4996e88f Merge branch 'develop' v1.1.0 Jeremy Stretch 2016-07-07 12:49:56 -0400
  • ec2626aa09 Resolved version conflict Jeremy Stretch 2016-07-07 12:49:35 -0400
  • ece16200a3 Resolved version conflict Jeremy Stretch 2016-07-07 12:49:35 -0400
  • 126dea9ebf Version bump for v1.1.0 Jeremy Stretch 2016-07-07 12:27:27 -0400
  • bfe8979523 Version bump for v1.1.0 Jeremy Stretch 2016-07-07 12:27:27 -0400
  • 5c6e3905b8 Move membership evaluation to SecretRole Jeremy Stretch 2016-07-07 12:07:02 -0400
  • 7228801cb0 Move membership evaluation to SecretRole Jeremy Stretch 2016-07-07 12:07:02 -0400
  • eb2af9141b Banner/MOTD Support Gelob 2016-06-28 11:12:36 -0400
  • 1338bf6012 Banner/MOTD Support Gelob 2016-06-28 11:12:36 -0400
  • 3c71b709ba Clarified secret role permissions Jeremy Stretch 2016-07-06 17:45:08 -0400
  • c19124fcac Clarified secret role permissions Jeremy Stretch 2016-07-06 17:45:08 -0400
  • 425776865a Grant superusers permission to decrypt all secrets Jeremy Stretch 2016-07-06 17:40:32 -0400
  • edde021c85 Grant superusers permission to decrypt all secrets Jeremy Stretch 2016-07-06 17:40:32 -0400
  • 8d837979ff #68: Improved permissions-related error handling Jeremy Stretch 2016-07-06 17:22:10 -0400
  • 966ea45050 #68: Improved permissions-related error handling Jeremy Stretch 2016-07-06 17:22:10 -0400
  • 277e8f902f Optimize database query for user actions list Jeremy Stretch 2016-07-06 16:36:07 -0400
  • e7f21dea4b Optimize database query for user actions list Jeremy Stretch 2016-07-06 16:36:07 -0400
  • 8874edad05 Fixes #214: Suppress status message if updated_count has not been provided Jeremy Stretch 2016-07-06 16:25:15 -0400
  • 3276caa284 Fixes #214: Suppress status message if updated_count has not been provided Jeremy Stretch 2016-07-06 16:25:15 -0400
  • 5d5a204d5f Cleaned up 'not connected' text Jeremy Stretch 2016-07-06 16:01:18 -0400
  • 891a128736 Cleaned up 'not connected' text Jeremy Stretch 2016-07-06 16:01:18 -0400
  • dac831048d Merge pull request #210 from peelman/develop Jeremy Stretch 2016-07-06 15:57:04 -0400
  • a74ddd8527 Merge pull request #210 from peelman/develop Jeremy Stretch 2016-07-06 15:57:04 -0400
  • 8909a76200 Fixes #209: Read pk list from POST instead of form Jeremy Stretch 2016-07-06 15:55:42 -0400
  • 24c48bece8 Fixes #209: Read pk list from POST instead of form Jeremy Stretch 2016-07-06 15:55:42 -0400
  • 6551f47323 critical connections placeholder should span 5 rows now Nick Peelman 2016-07-06 15:46:00 -0400
  • a069e92ce0
    critical connections placeholder should span 5 rows now Nick Peelman 2016-07-06 15:46:00 -0400
  • 7a19c699fb Standardized console/power/interface display Jeremy Stretch 2016-07-06 14:40:40 -0400
  • c0ab9f70dc Standardized console/power/interface display Jeremy Stretch 2016-07-06 14:40:40 -0400
  • 24b60fc1d3 Force 48-bit MAC format for proper error messages during validation Jeremy Stretch 2016-07-06 14:22:34 -0400
  • cc17604220 Force 48-bit MAC format for proper error messages during validation Jeremy Stretch 2016-07-06 14:22:34 -0400
  • b8112483e5 Merge pull request #170 from peelman/add-mac-address-to-interface Jeremy Stretch 2016-07-06 13:38:46 -0400
  • 9793b406e9 Merge pull request #170 from peelman/add-mac-address-to-interface Jeremy Stretch 2016-07-06 13:38:46 -0400
  • 59128bc7ab Regenerate migration Nick Peelman 2016-07-06 13:22:41 -0400
  • 7a2f6eaf34
    Regenerate migration Nick Peelman 2016-07-06 13:22:41 -0400
  • aed0f2f2cb Fix connected interface template rendering... Nick Peelman 2016-07-05 11:55:06 -0400
  • dc847ce4d6
    Fix connected interface template rendering... Nick Peelman 2016-07-05 11:55:06 -0400
  • ed64efa89e Fix PEP8 compliance...(again) Nick Peelman 2016-07-05 10:58:28 -0400
  • 578013fdd2
    Fix PEP8 compliance...(again) Nick Peelman 2016-07-05 10:58:28 -0400
  • edfb17ca16 Fix PEP8 compliance... Nick Peelman 2016-07-05 10:48:36 -0400
  • 9f75d5bd23
    Fix PEP8 compliance... Nick Peelman 2016-07-05 10:48:36 -0400
  • 8658b497d7 Remove external macaddress package dependency Nick Peelman 2016-07-05 10:41:38 -0400
  • a6d41c95b8
    Remove external macaddress package dependency Nick Peelman 2016-07-05 10:41:38 -0400
  • 45ed851277 Tests pass now Nick Peelman 2016-07-01 14:40:29 -0400
  • 9da4c28cd5
    Tests pass now Nick Peelman 2016-07-01 14:40:29 -0400
  • 8dd76556b2 Add fixtures for mac addresses. add mac addresses to api tests Nick Peelman 2016-07-01 14:00:12 -0400
  • 0ce92cb2ee
    Add fixtures for mac addresses. add mac addresses to api tests Nick Peelman 2016-07-01 14:00:12 -0400
  • 3ceb5261b7 Relocate Add Interface button to match the style used in the rest of the view Nick Peelman 2016-07-01 10:31:09 -0400
  • 6fb530b75d
    Relocate Add Interface button to match the style used in the rest of the view Nick Peelman 2016-07-01 10:31:09 -0400
  • e7683eb833 Add MAC address field to interfaces Nick Peelman 2016-07-01 10:30:49 -0400
  • 5034b836ea
    Add MAC address field to interfaces Nick Peelman 2016-07-01 10:30:49 -0400
  • 7c55a32b77 Merge pull request #207 from ryanmerolle/develop Jeremy Stretch 2016-07-06 12:48:17 -0400
  • 35f3355cfe Merge pull request #207 from ryanmerolle/develop Jeremy Stretch 2016-07-06 12:48:17 -0400
  • 16674e3302 Updated Upgrade Instructions & apt-get install ryanmerolle 2016-07-06 12:26:45 -0400
  • 65514102cd Updated Upgrade Instructions & apt-get install ryanmerolle 2016-07-06 12:26:45 -0400
  • 64d4598905 Merge 9a82aa0c14 into 343b65cb50 Jeremy Stretch 2016-07-06 16:16:49 +0000
  • 9a82aa0c14 Revert "Updated Upgrade Instructions" Jeremy Stretch 2016-07-06 12:16:43 -0400
  • b1143a4c12 Merge pull request #205 from ryanmerolle/patch-2 Jeremy Stretch 2016-07-06 11:50:01 -0400
  • 343b65cb50 Merge pull request #205 from ryanmerolle/patch-2 Jeremy Stretch 2016-07-06 11:50:01 -0400
  • 1f32e6c611 Updated Upgrade Instructions ryanmerolle 2016-07-06 10:10:57 -0400
  • 33d755d51a Updated Upgrade Instructions ryanmerolle 2016-07-06 10:10:57 -0400
  • 4eee663895 Fix issues failing CI Gelob 2016-07-06 03:28:39 -0400
  • 4ea70763e1 Support VLAN in Import Prefixes, Add VLAN column to Prefixes page Gelob 2016-06-28 11:12:36 -0400
  • 958f32e266 Add LDAP Authentication Documentation dinoocch 2016-07-05 22:01:19 -0500
  • 9750da4761 Add LDAP Authentication Documentation dinoocch 2016-07-05 22:01:19 -0500
  • b52c472e89 Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField Jeremy Stretch 2016-07-05 18:15:24 -0400
  • d974cecda3 Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField v1.0.7-r1 Jeremy Stretch 2016-07-05 18:15:24 -0400
  • e3427e9989 Revert "v1.1.0 release" Jeremy Stretch 2016-07-05 18:12:05 -0400
  • 5e9090a03a Revert "v1.1.0 release" Jeremy Stretch 2016-07-05 18:12:05 -0400
  • 34cf5fd90c Merge branch 'master' of github.com:digitalocean/netbox into develop Jeremy Stretch 2016-07-05 18:00:35 -0400
  • 60b48f9e4e Merge branch 'master' of github.com:digitalocean/netbox into develop Jeremy Stretch 2016-07-05 18:00:35 -0400
  • 7fb5b825f0 v1.1.0 release Jeremy Stretch 2016-07-05 18:00:12 -0400
  • e8b8b015bb v1.1.0 release Jeremy Stretch 2016-07-05 18:00:12 -0400
  • fd3459f4c1 Merge branch 'develop' of github.com:digitalocean/netbox into develop Jeremy Stretch 2016-07-05 17:36:44 -0400
  • 7021ce2ecf Merge branch 'develop' of github.com:digitalocean/netbox into develop Jeremy Stretch 2016-07-05 17:36:44 -0400
  • c7bcbdc985 Merge branch 'devicetype-fixes' into develop Jeremy Stretch 2016-07-05 17:36:27 -0400
  • 58e23a9773 Merge branch 'devicetype-fixes' into develop Jeremy Stretch 2016-07-05 17:36:27 -0400
  • 7d9a7d6a07 Improve DeviceType display (credit to @peelman); add validation for DeviceType components Jeremy Stretch 2016-07-05 17:30:16 -0400
  • 064582f6c5 Improve DeviceType display (credit to @peelman); add validation for DeviceType components Jeremy Stretch 2016-07-05 17:30:16 -0400
  • d606266444 Merge pull request #188 from ChristianKniep/no_local_mounts Jeremy Stretch 2016-07-05 16:49:12 -0400
  • 75789fc956 Merge pull request #188 from ChristianKniep/no_local_mounts Jeremy Stretch 2016-07-05 16:49:12 -0400
  • 7a9785880d Merge pull request #184 from koep/develop Jeremy Stretch 2016-07-05 16:47:03 -0400
  • 1c159968bf Merge pull request #184 from koep/develop Jeremy Stretch 2016-07-05 16:47:03 -0400
  • c250d3ae7f Merge pull request #197 from digitalocean/device-bays Jeremy Stretch 2016-07-05 16:44:06 -0400
  • 1b5231c188 Merge pull request #197 from digitalocean/device-bays Jeremy Stretch 2016-07-05 16:44:06 -0400
  • f95240e5bf Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField Jeremy Stretch 2016-07-05 16:39:43 -0400
  • dc3cbfcdd4 Fixes #199: Moved prefix_validator from BaseIPField to IPNetworkField Jeremy Stretch 2016-07-05 16:39:43 -0400
  • feab595601 Fix DeviceBay inclusion in admin UI Jeremy Stretch 2016-07-05 16:35:44 -0400
  • ee65d3f406 Fix DeviceBay inclusion in admin UI Jeremy Stretch 2016-07-05 16:35:44 -0400
  • cbfef1f1a4 Improved device bay documentation Jeremy Stretch 2016-07-05 16:20:33 -0400
  • fc9aa03dc1 Improved device bay documentation Jeremy Stretch 2016-07-05 16:20:33 -0400
  • ab9e4c7c5a Updated documentation to include device bays Jeremy Stretch 2016-07-05 16:02:11 -0400
  • 34c332d165 Updated documentation to include device bays Jeremy Stretch 2016-07-05 16:02:11 -0400
  • 53422058ae Fixed API tests Jeremy Stretch 2016-07-05 15:50:21 -0400