Commit Graph

3135 Commits

Author SHA1 Message Date
dansheps
daa6f454b2 Fix #3228 - UrlEncode full path for next if not on logon page
Include the full path for the ?next= variable in login links if we are not on the logon page.
Additionally include next for post requests that have the next variable set (will only come from the login page itself generally)
2019-05-30 12:01:41 -05:00
dansheps
58bf1c3f14 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	netbox/utilities/middleware.py
2019-05-30 10:59:25 -05:00
dansheps
409b8e8e6a Fix #3228 - Send full path info instead of just path info and urlencode said path info 2019-05-30 10:58:39 -05:00
dansheps
29b7fb3471 Fix #3228 - Send full path info instead of just path info and urlencode said path info 2019-05-30 10:54:29 -05:00
Jeremy Stretch
e5094ca6b4 Remove request.user assertion from ObjectChangeMiddleware 2019-05-30 10:32:09 -04:00
Jeremy Stretch
fec3ee9ed3 Fixes #3227: Fix exception when deleting a circuit with a termination(s) 2019-05-29 17:17:06 -04:00
Jeremy Stretch
7aabb6fa32 Closes #3151: Add inventory item count to manufacturers list 2019-05-29 15:20:36 -04:00
Jeremy Stretch
1c807fa212 Closes #3185: Improve performance for custom field access within templates 2019-05-29 15:04:57 -04:00
Jeremy Stretch
f4560467a3 Fixed test from #3211 follow-up work 2019-05-29 10:51:49 -04:00
Jeremy Stretch
5aa4772507 Changelog & grammar tweak for #3211 2019-05-29 10:33:29 -04:00
Jeremy Stretch
08bcc8ca76 Merge pull request #3222 from hellerve/tmp
Fix error message on trying to delete protected models
2019-05-29 10:24:28 -04:00
Jeremy Stretch
c352ace806 Merge pull request #3195 from TakeMeNL/feature/3156
Closes #3156: Add site link to rack reservations overview
2019-05-29 10:19:10 -04:00
Jeremy Stretch
938ceb5ac6 Changelog for #3031 2019-05-29 10:10:07 -04:00
Jeremy Stretch
ed20be755b Merge pull request #3197 from KhaledTo/bug/3031
Fixes #3031: Select2 creates multiple tags for tags with spaces
2019-05-29 10:08:59 -04:00
TakeMeNL
c07652d5d1 Closes #3156: Add site link to rack reservations overview 2019-05-29 16:08:24 +02:00
hellerve
3192319f2a utilities: move protectederror handling to modelviewset 2019-05-28 21:11:23 +02:00
Jeremy Stretch
1c05951957 Bump DRF to 3.9.1 to address WS-2019-0037 2019-05-28 14:21:36 -04:00
Jeremy Stretch
834b4a541e Merge pull request #3216 from hellerve/fix-3168
Fix 3168: Update to new path syntax
2019-05-28 13:16:08 -04:00
Jeremy Stretch
4f0e0b5642 Fixes #3223: Fix filtering devices by "has power outlets" 2019-05-28 13:10:54 -04:00
hellerve
8b8190f9b4 all: fix error message on trying to delete protected models (references #3211) 2019-05-28 17:31:02 +02:00
hellerve
98e7c38457 netbox urls: move to re_path as suggested by @jeremystretch 2019-05-27 22:41:10 +02:00
Jeremy Stretch
9e0f708432 Changelog for #3184 2019-05-27 15:03:00 -04:00
Jeremy Stretch
d5de9f884e Merge pull request #3199 from candlerb/candlerb/3184
Add grey border around color-block
2019-05-27 15:00:48 -04:00
hellerve
228aef0345 utilities: add converters module and use for json/yaml url 2019-05-26 14:56:01 +02:00
hellerve
d264c5f011 urls: fix 3168 by changing url to path 2019-05-26 14:56:00 +02:00
Brian Candler
09696c18ae Add grey border around color-block
Fixes #3184
2019-05-20 21:06:53 +01:00
Khaled BEN ABDALLAH
5a57c9b6b7 Fixes #3031: Select2 creates multiple tags for tags with spaces 2019-05-18 22:43:47 +02:00
Jeremy Stretch
591627e048 Closes #3138: Add 2.5GE and 5GE interface form factors 2019-05-16 20:49:00 -04:00
Jeremy Stretch
29aab8611f Closes #3183: Enable bulk deletion of sites 2019-05-16 20:24:55 -04:00
Jeremy Stretch
53257a5838 Fixes #3190: Fix custom field rendering for Jinja2 export templates 2019-05-16 19:45:36 -04:00
Jeremy Stretch
f395820b76 Closes #3186: Add interface name filter for IP addresses 2019-05-14 19:03:03 -04:00
Jeremy Stretch
592ab864e8 Move TenancyFilterForm to tenancy.forms 2019-05-09 14:36:18 -04:00
Jeremy Stretch
9c597d7a96 Cleanup from #2931 2019-05-09 14:32:49 -04:00
Jeremy Stretch
6ee88050bc Merge pull request #2931 from DanSheps/2813-addtenantgroupfilter
Closes #2813: Add Filter and View on Lists for TenantGroup
2019-05-09 13:48:46 -04:00
Daniel Sheppard
527b78ecf0 Merge pull request #3158 from tb-killa/3150
Fixes: #3150- Formatting of cable length in cable trace
2019-05-06 11:54:28 -05:00
Daniel Sheppard
42ffb121e8 Update CHANGELOG.md 2019-05-06 11:54:16 -05:00
Oli
805a96de6f Formatting of cable length in cable trace 2019-05-06 15:36:44 +02:00
Jeremy Stretch
cecb2dd63f Closes #3085: Catch all exceptions during export template rendering 2019-05-02 15:36:51 -04:00
Jeremy Stretch
df4dabf71a Merge pull request #3142 from austin987/upgrade-cwd
upgrade.sh: make sure we are in the right directory
2019-05-02 14:51:37 -04:00
Austin English
6a796a3303 upgrade.sh: make sure we are in the right directory 2019-05-02 13:02:53 -05:00
Jeremy Stretch
3b64cc1dff Changelog for #3132 2019-05-02 11:41:37 -04:00
Jeremy Stretch
57639c4acf Merge pull request #3133 from shanemadden/cable_circuit_endpoint_choice
Fixes: #3132: Add circuittermination to the choices API for cable endpoints
2019-05-02 11:39:18 -04:00
Shane Madden
f7f7d3a567 Add circuittermination as a choice for cable endpoint types, which is not in the choices API for cable termination types but is accepted by the application as a valid endpoint for cables 2019-05-01 13:47:52 -06:00
Jeremy Stretch
10bd1812c9 Post-release version bump 2019-05-01 11:09:11 -04:00
Jeremy Stretch
91e7863956 Release v2.5.12 2019-05-01 11:08:32 -04:00
Jeremy Stretch
73ffe3a57b Fixes #3127: Fix natural ordering of device components 2019-04-30 13:25:37 -04:00
dansheps
0ca77b8605 Remove tenant group from ipam table 2019-04-30 10:06:27 -05:00
dansheps
92f18d9076 Merge branch 'develop' of https://github.com/digitalocean/netbox into 2813-addtenantgroupfilter 2019-04-30 10:01:29 -05:00
Jeremy Stretch
1a84531964 Fix broken link 2019-04-29 16:55:17 -04:00
Jeremy Stretch
0f6c792bed Revert previous change 2019-04-29 16:44:13 -04:00