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

975 Commits

Author SHA1 Message Date
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
Robin Schneider ee40e339c8
NetBox should always be referred to as NetBox 
Fix all instances of "Netbox".

```Shell
git ls-files -z . | xargs --null -I '{}' find './{}' -type f -print0 | xargs --null sed --in-place --regexp-extended 's#Netbox#NetBox#g;'
```

Ref: https://netbox.readthedocs.io/en/stable/development/style-guide/#branding
 2021-02-04 21:48:08 +01:00
Tobias Genannt 04e0b3d3ca
Merge pull request #421 from tobiasge/django-storages-backends 
Provide backends for django-storages in our images
 2021-02-04 19:36:21 +01:00
Christian Mäder fa70e0b761
Merge pull request #423 from netbox-community/ImprovedIssueTemplate 
Change the phrasing of the alternative issue options
 2021-02-03 21:59:42 +01:00
Christian Mäder 88b35eb48e Change the phrasing of the alternative options 2021-02-03 21:46:11 +01:00
Tobias Genannt 5644254113 Provide backends for django-storages in our images 2021-02-03 20:01:36 +01:00
Christian Mäder 4dd7a51c7d
Merge pull request #419 from netbox-community/develop 
Version 1.0.1
 2021-02-03 15:30:31 +01:00
Christian Mäder c7e259e116 Merge branch 'release' into develop 2021-02-03 15:01:11 +01:00
Christian Mäder 3cbe07cb0e Preparation for 1.0.1 2021-02-03 14:52:21 +01:00
Tobias Genannt 70b38d52b9
Merge pull request #413 from tobiasge/fix-412 
Is greater than or equal to is "-ge" and not "-gte".
 2021-01-31 21:38:49 +01:00
Tobias Genannt a21d146b60 Is greater than or equal to is "-ge" and not "-gte". 2021-01-31 16:39:45 +01:00
Christian Mäder 6e7a64bd81
Merge pull request #410 from netbox-community/renovate/django-storages-1.x 
Update dependency django-storages to v1.11.1
 2021-01-31 16:07:40 +01:00
Renovate Bot f8360ba6aa
Update dependency django-storages to v1.11.1 2021-01-31 14:42:24 +00:00
Christian Mäder bab8373f66
Merge pull request #411 from netbox-community/renovate/actions-checkout-2.x 
Update actions/checkout action to v2
 2021-01-31 15:41:41 +01:00
Renovate Bot ad93c99f46
Update actions/checkout action to v2 2021-01-31 11:55:20 +00:00
Christian Mäder ed6256172f
Merge pull request #394 from netbox-community/develop 
Prepare version 1.0.0
 2021-01-29 10:48:29 +01:00
Christian Mäder 5109e340ca Prepare for Version 1.0.0 2021-01-28 10:22:48 +01:00
Christian Mäder 62d31fda58
Merge pull request #398 from netbox-community/updateYAML 
Update of ruamel.yaml
 2021-01-20 16:08:03 +01:00
Tobias Genannt ed141c8a4e
Merge pull request #399 from tobiasge/prevent-edge-from-failing 
Prevent "alpine:edge" from failling the workflow
 2021-01-20 13:14:09 +01:00
Christian Mäder 4d8d02e35a
Merge pull request #397 from netbox-community/SkipStartupScriptsForUnitTests 
Skip Startup Scripts in Unit Tests
 2021-01-20 13:08:25 +01:00
Tobias Genannt 96132e1dcc Prevent "alpine:edge" from failling the workflow 
Alpine is releases a new version once a year. Therefore our workflow
runs don't need to be marked as failed when run on alpine:edge
 2021-01-20 10:43:07 +01:00
Christian Mäder 896651ed97 Update of ruamel.yaml 2021-01-20 09:50:00 +01:00
Christian Mäder f810d0342d Skip Startup Scripts in Unit Tests 2021-01-20 09:36:13 +01:00
Christian Mäder 323e18278a Merge branch 'MajesticFalcon-iss365' into develop 2021-01-20 09:03:31 +01:00
Schylar Utley a0f7737916 rebase and fix script order 2021-01-20 09:03:04 +01:00
Schylar Utley 7f8cc76af6 address issue #365 2021-01-20 09:03:04 +01:00
Christian Mäder 21bd7f426c
Merge pull request #393 from MajesticFalcon/vm_init_bug 
Bugfix - Allow primary device IP without virtual machine initialization
 2021-01-20 08:54:13 +01:00
Christian Mäder 3758bc805a
Merge pull request #396 from netbox-community/renovate/configure 
Configure Renovate
 2021-01-20 08:26:35 +01:00
Christian Mäder 72859ca71a Configure Renovate 2021-01-20 08:24:47 +01:00
Renovate Bot 0022392f03 Add renovate.json 2021-01-20 08:24:28 +01:00
Schylar Utley 385c66e30d
Update startup_scripts/270_primary_ips.py 
Ah, of course.. I would agree. :)

Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2021-01-19 12:54:52 -06:00