Commit Graph

785 Commits

Author SHA1 Message Date
Tobias Genannt 5b34df1471 Build feature branch
The branch for the next version of Netbox is now called "feature".
2021-04-26 09:44:52 +02:00
Christian Mäder f2731d3fe6
Merge pull request #448 from ryanmerolle/develop
AUTH_LDAP_MIRROR_GROUPS ldap_config tweak
2021-04-20 10:15:52 +02:00
ryanmerolle 6f4d025cb7 backed out ldap_config changes 2021-04-20 03:38:20 -04:00
ryanmerolle 222ede2c4b enahance ldap extra.py with more examples 2021-04-20 03:35:57 -04:00
Christian Mäder 5304c8f901
Merge pull request #483 from netbox-community/renovate/django-auth-ldap-2.x
Update dependency django-auth-ldap to v2.4.0
2021-04-20 09:24:20 +02:00
Ryan Merolle 28a26288c9
Merge pull request #3 from netbox-community/develop
pull in develop changes
2021-04-19 22:25:55 -04:00
Renovate Bot 53d759e263
Update dependency django-auth-ldap to v2.4.0 2021-04-19 13:13:02 +00:00
Tobias Genannt 6879412e2b
Merge pull request #495 from tobiasge/no-random-port
Don't publish Netbox on random port
2021-04-19 11:33:23 +02:00
Tobias Genannt a89d2e035c Don't publish Netbox on random port 2021-04-17 10:16:40 +02:00
Tobias Genannt d5c92e9a7d Preparation for 1.2.0 2021-04-16 20:27:33 +02:00
Tobias Genannt c7df608696
Merge pull request #485 from tobiasge/prepare-2.11
Initializer updates for Netbox 2.11
2021-04-16 20:00:35 +02:00
Christian Mäder eee07f703a
Merge pull request #492 from jhujhiti/upstreaming
Fix quoting of exec argument in the entrypoint script
2021-04-16 08:42:15 +02:00
Erick Turnquist 6e7d5a6f59 Fix quoting of exec argument in the entrypoint script 2021-04-15 17:36:14 -04:00
Tobias Genannt 752f592e58
Fixed Python f-string
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
2021-04-13 15:50:23 +02:00
Tobias Genannt f637de88f0 Improved error logging 2021-04-13 14:38:52 +02:00
Christian Mäder a5da38203f
Merge pull request #482 from Daimler/custom-link-error-fix
Fixes #480: Custom Links initialiser breaks if content_type is invalid
2021-04-13 09:33:41 +02:00
Christian Mäder 14c0d17704
Merge pull request #486 from netbox-community/renovate/ruamel.yaml-0.x
Update dependency ruamel.yaml to v0.17.4
2021-04-12 17:12:05 +02:00
Renovate Bot a572d5f5de
Update dependency ruamel.yaml to v0.17.4 2021-04-07 20:52:56 +00:00
Tobias Genannt 3673196c16 Fields in Custom links have been renamed 2021-04-07 15:19:14 +02:00
Tobias Genannt 9874cef369 VLAN Groups can be scoped to multiple types 2021-04-07 15:18:33 +02:00
Tobias Genannt 1c4b6741ac Fixed isort issues 2021-04-07 11:01:01 +02:00
Tobias Genannt b18e4aaf92 Fix super-linter on PRs
See: https://github.com/github/super-linter#example-connecting-github-action-workflow
2021-04-07 10:57:14 +02:00
Tobias Genannt 45824ba4f3 Devices can be added to locations 2021-04-07 09:57:59 +02:00
Tobias Genannt 5944086435 Rack groups have been renamed to locations 2021-04-07 09:40:58 +02:00
Marcus Crane a2e33c166d
Fix link name reference if content type is invalid
Currently, the name of a custom link is referenced
as if it is an object attribute which causes a break
due to it actually being a dictionary.

This minor change means that the startup script won't
*ahem* fail upon failing :)

Signed-Off-by: Marcus Crane <marcus.crane@daimler.com>
2021-04-01 18:48:13 +13:00
Christian Mäder 9ab202f921
Merge pull request #479 from netbox-community/renovate/ruamel.yaml-0.x 2021-03-29 19:25:17 +02:00
Renovate Bot cca79b5dbd
Update dependency ruamel.yaml to v0.17.2 2021-03-29 17:03:30 +00:00
Christian Mäder 61eecdd343
Merge pull request #477 from netbox-community/renovate/ruamel.yaml-0.x
Update dependency ruamel.yaml to v0.17.0
2021-03-26 18:16:33 +01:00
Renovate Bot ce6fe5cb83
Update dependency ruamel.yaml to v0.17.0 2021-03-26 11:37:33 +00:00
Christian Mäder 8f119ede13
Merge pull request #469 from cimnine/Sponsoring
Sponsor Message
2021-03-12 18:31:53 +01:00
Christian Mäder edb61f3d90 Sponsor Message 2021-03-11 19:06:49 +01:00
Christian Mäder cb5ffa0354
Merge pull request #460 from netbox-community/renovate/ruamel.yaml-0.x
Update dependency ruamel.yaml to v0.16.13
2021-03-05 15:31:33 +01:00
Renovate Bot ff1eed3cf0
Update dependency ruamel.yaml to v0.16.13 2021-03-05 09:58:42 +00:00
Christian Mäder 53d593de25 Preparation for 1.1.0 2021-03-04 12:07:21 +01:00
Christian Mäder 8111da308b
Merge pull request #455 from cimnine/NewSlack
New Slack
2021-03-04 12:04:02 +01:00
Christian Mäder 0125ab4849 New Slack and wording improvements in templates 2021-03-04 09:59:05 +01:00
Christian Mäder ad0c04985b
Merge pull request #452 from cimnine/ReleaseScript
Release Script
2021-03-01 08:52:17 +01:00
Christian Mäder 793393fe0f Fix DEFAULT_REPO in release.sh 2021-03-01 08:27:24 +01:00
Christian Mäder 59995a8719 Add release script 2021-02-27 15:05:05 +01:00
Ryan Merolle f19d650412
Merge pull request #1 from netbox-community/develop
Merge upstream changes
2021-02-25 12:14:16 -05:00
Christian Mäder 6cd156f7d5
Merge pull request #450 from netbox-community/FilterMainConfig
Fix loading main_config again during discovery of dynamic configurations
2021-02-24 08:21:18 +01:00
Christian Mäder 95976f4cf4 Don't load main config twice
Before, the main_config (e.g. 'configuration.py' or 'ldap_config.py') were loaded twice.
The first load was hard-coded and correct.
The second load was during the discovery phase for dynamic configurations.
This has now been fixed. During the discovery for dynamic configurations,
the main_config file is now excluded.

Thanks @tobiasge for discovering this bug.
2021-02-23 22:50:16 +01:00
Ryan Merolle 0dec4d8df4
Add extra.py example for ldap config 2021-02-22 16:00:08 -05:00
ryanmerolle 22186b267d do not set AUTH_LDAP_MIRROR_GROUPS if not defined 2021-02-22 15:55:40 -05:00
ryanmerolle 020e0adeb4 update .gitignore to keep extra.py in ldap config 2021-02-22 15:53:02 -05:00
Christian Mäder 009eb1fc6d
Merge pull request #444 from netbox-community/RemoveMicroBadger
Remove MicroBadger Badges
2021-02-19 08:52:06 +01:00
Christian Mäder 989c250a82 Remove MicroBadger Badges
The service will shutdown in 2021:
https://microbadger.com/shutdown
2021-02-18 16:57:51 +01:00
Christian Mäder 3ee231bdd8
Merge pull request #438 from netbox-community/renovate/django-auth-ldap-2.x
Update dependency django-auth-ldap to v2.3.0
2021-02-16 08:54:57 +01:00
Renovate Bot 3338cdc9d7
Update dependency django-auth-ldap to v2.3.0 2021-02-16 00:06:58 +00:00
Christian Mäder c80fb19507
Merge pull request #432 from netbox-community/develop
Version 1.0.2
2021-02-10 13:15:49 +01:00