Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
955 Commits 2 Branches 56 Tags 1.4 MiB
Commit Graph

955 Commits

Author SHA1 Message Date
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
Christian Mäder 74543ec272 Preparation for 1.0.2 2021-02-10 12:47:54 +01:00
Christian Mäder 9ccf0ac921
Merge pull request #431 from netbox-community/VersionsToWiki 
Move Documentation about Version to Wiki
 2021-02-10 12:47:09 +01:00
Christian Mäder 8aed79363a Move Documentation about Version to Wiki 
See https://github.com/netbox-community/netbox-docker/wiki/Version.
 2021-02-10 12:45:37 +01:00
Christian Mäder f7337ed1e9
Merge pull request #427 from netbox-community/AddEditorconfig 
Introduce Linting-Step in Build
 2021-02-10 12:35:48 +01:00
Christian Mäder 4c8435e874 fixup! Lint the syntax of changes 2021-02-10 10:48:45 +01:00
Christian Mäder a37f1592fc Sort env files 2021-02-08 18:56:30 +01:00
Christian Mäder 04ac3d5f4b Format shell scripts with shfmt 2021-02-08 18:56:30 +01:00
Christian Mäder c6df6a040a Fix shellcheck complaint 2021-02-08 18:56:30 +01:00
Christian Mäder 28e4ae44fb Lint the syntax of changes 2021-02-08 18:56:30 +01:00
Christian Mäder 493fc60401 Use black as formatter for python files 2021-02-08 18:24:29 +01:00
Christian Mäder 0d25aff744 Add editorconfig 2021-02-08 18:24:29 +01:00
Christian Mäder f33c647f24 Merge branch 'MajesticFalcon-feature' into develop 2021-02-08 10:37:04 +01:00
Christian Mäder 16ae063321 Adjust to repository standards 2021-02-08 10:36:50 +01:00
Schylar Utley e4e2c788a9 Update 290_webhooks.py 
Move to a more standard method of object handling
 2021-02-08 10:09:55 +01:00
Schylar Utley 2e5d84612d Update initializers/custom_links.yml 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-02-08 10:09:55 +01:00
Schylar Utley 744f0e57ad Update initializers/webhooks.yml 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-02-08 10:09:55 +01:00
Schylar Utley 52c51b5f99 Update initializers/custom_links.yml 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-02-08 10:09:55 +01:00
Schylar Utley f88f4e1579 Update startup_scripts/290_webhooks.py 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-02-08 10:09:55 +01:00
Schylar Utley 95f4d7856a Update startup_scripts/280_custom_links.py 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-02-08 10:09:55 +01:00
Schylar Utley 07a0b1d7ef Update startup_scripts/280_custom_links.py 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-02-08 10:09:55 +01:00
Schylar Utley fe811f37bd replace loop with list comprehension 2021-02-08 10:09:55 +01:00
Schylar Utleye 8321449cc0 add icons to help messages 2021-02-08 10:09:55 +01:00
Schylar Utleye 618feff63a add error handling for webhook and custom links. fix initializer comments 2021-02-08 10:09:55 +01:00
Schylar Utleye a3cf645dc5 fix webhook initializer yaml and webhook startup script to work with latest netbox release 2021-02-08 10:09:55 +01:00
Schylar Utleye d0c786e831 Update webhooks.yml 
fix comment
 2021-02-08 10:09:54 +01:00
Schylar Utleye 7112a88359 add webhook initializer 2021-02-08 10:09:54 +01:00
Schylar Utleye 187ae4b2a1 add custom link initializers 2021-02-08 10:09:54 +01:00
Christian Mäder 3a0b3fe133
Merge pull request #426 from netbox-community/FixBuild 
Dependencies to build 'cryptography' Python package
 2021-02-08 09:55:12 +01:00
Christian Mäder 5343eaae65 Fix building cryptography pip 2021-02-08 09:03:33 +01:00
Christian Mäder 83a0d5d12f
Merge pull request #425 from ypid/fix/branding 
NetBox should always be referred to as NetBox
 2021-02-04 22:17:29 +01:00