From 28a06bdd138eab3bdae39abb19c7427e9ab938eb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 29 Jun 2016 17:48:11 -0400
Subject: [PATCH 01/12] Version bump for next release

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index fed0c2fd7..7e4a22378 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -11,7 +11,7 @@ except ImportError:
                                "the documentation.")
 
 
-VERSION = '1.0.6'
+VERSION = '1.0.7'
 
 # Import local configuration
 for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']:

From 204adb4639fd1f1ed2ca7a6d280051cbb33cbb69 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 29 Jun 2016 22:51:10 -0400
Subject: [PATCH 02/12] Fixes #135: Add button to toggle navbar on small
 screens

---
 netbox/templates/_base.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index 1d5fa1ad5..9feb87bde 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -13,6 +13,12 @@
     <nav class="navbar navbar-default navbar-fixed-top">
         <div class="container">
             <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
                 <a class="navbar-brand" href="/">NetBox</a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">

From 4b6420f5c59209f5e0211c4502f5fbb3e1ab958e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 29 Jun 2016 23:16:16 -0400
Subject: [PATCH 03/12] Fixed typo

---
 docs/getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 0ddccd2c9..55233a831 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -321,7 +321,7 @@ Save the contents of the above example in `/etc/apache2/sites-available/netbox.c
 
 ## gunicorn Configuration
 
-Save the following configuration file in the root netbox installation path (in this example, `/opt/netbox/`.) as `gunicorn_config.py`. Be sure to verify the location of the gunicorn executable (e.g. `which gunicorn`) and to update the `pythonpath` variable if needed.
+Save the following configuration file in the root netbox installation path (in this example, `/opt/netbox/`) as `gunicorn_config.py`. Be sure to verify the location of the gunicorn executable (e.g. `which gunicorn`) and to update the `pythonpath` variable if needed.
 
 ```
 command = '/usr/bin/gunicorn'

From fe6d24fd8b252e8a15cd21ca0cce1ae711adac31 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 29 Jun 2016 23:49:59 -0400
Subject: [PATCH 04/12] Corrected instruction for cloning the repo

---
 docs/getting-started.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 55233a831..273bc0a1f 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -93,10 +93,10 @@ If `git` is not already installed, install it:
 # sudo apt-get install git
 ```
 
-Next, clone the NetBox git repository into the current directory:
+Next, clone the **master** branch of the NetBox GitHub repository into the current directory:
 
 ```
-# git clone https://github.com/digitalocean/netbox.git .
+# git clone -b master https://github.com/digitalocean/netbox.git .
 Cloning into '.'...
 remote: Counting objects: 1994, done.
 remote: Compressing objects: 100% (150/150), done.
@@ -166,6 +166,7 @@ You may use the script located at `netbox/generate_secret_key.py` to generate a
 Before NetBox can run, we need to install the database schema. This is done by running `./manage.py migrate` from the `netbox` directory (`/opt/netbox/netbox/` in our example):
 
 ```
+# cd /opt/netbox/netbox/
 # ./manage.py migrate
 Operations to perform:
   Apply all migrations: dcim, sessions, admin, ipam, utilities, auth, circuits, contenttypes, extras, secrets, users

From 7e35c83e44ccda516caf804bcbc64a7ca3b9f093 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 30 Jun 2016 11:39:25 -0400
Subject: [PATCH 05/12] Fixes #141: Removed invalid character

---
 docs/getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 273bc0a1f..2da4676cb 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -361,7 +361,7 @@ To add SSL support to the installation we'll start by installing the arbitrary p
 # sudo apt-get -y bc
 ```
 
-Next we'll clone Let’s Encrypt in to /opt
+Next we'll clone Let's Encrypt into /opt/:
 
 ```
 # sudo git clone https://github.com/letsencrypt/letsencrypt /opt/letsencrypt

From 9f7a8fd0cd99396bb1336d0b939c87b31a8d4dc2 Mon Sep 17 00:00:00 2001
From: ryanmerolle <Ryan.merolle@gmail.com>
Date: Thu, 30 Jun 2016 13:02:06 -0400
Subject: [PATCH 06/12] standardized app installation commands

* Standardized all install commands to use sudo & -y to avoid new user confusion.
* Added required missing installation (apache2 missing in Web Server and gunicorn section)
* Consolidated installs for a section to follow same format (Web Server and gunicorn section nginx)
* Added missing install argument when installing the arbitrary precision calculator language.
---
 docs/getting-started.md | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 2da4676cb..59bb341be 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -15,7 +15,7 @@ The following packages are needed to install PostgreSQL:
 * python-psycopg2
 
 ```
-# apt-get install postgresql libpq-dev python-psycopg2
+# sudo apt-get install -y postgresql libpq-dev python-psycopg2
 ```
 
 ## Configuration
@@ -61,7 +61,7 @@ NetBox requires following dependencies:
 * graphviz
 
 ```
-# apt-get install python2.7 python-dev git python-pip libxml2-dev libxslt1-dev libffi-dev graphviz
+# sudo apt-get install -y python2.7 python-dev git python-pip libxml2-dev libxslt1-dev libffi-dev graphviz
 ```
 
 You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
@@ -90,7 +90,7 @@ Create the base directory for the NetBox installation. For this guide, we'll use
 If `git` is not already installed, install it:
 
 ```
-# sudo apt-get install git
+# sudo apt-get install -y git
 ```
 
 Next, clone the **master** branch of the NetBox GitHub repository into the current directory:
@@ -111,7 +111,7 @@ Checking connectivity... done.
 Install the necessary Python packages using pip. (If you encounter any compilation errors during this step, ensure that you've installed all of the required dependencies.)
 
 ```
-# pip install -r requirements.txt
+# sudo pip install -r requirements.txt
 ```
 
 ## Configuration
@@ -235,19 +235,13 @@ If the test service does not run, or you cannot reach the NetBox home page, some
 We'll set up a simple HTTP front end using [gunicorn](http://gunicorn.org/) for the purposes of this guide. For web servers, we provide example configurations for both [nginx](https://www.nginx.com/resources/wiki/) and [Apache](http://httpd.apache.org/docs/2.4). (You are of course free to use whichever combination of HTTP and WSGI services you'd like.) We'll also use [supervisord](http://supervisord.org/) for service persistence. 
 
 ```
-# apt-get install gunicorn supervisor
+# sudo apt-get install -y gunicorn supervisor apache2 nginx
 ```
 
 ## nginx Configuration
 
 The following will serve as a minimal nginx configuration. Be sure to modify your server name and installation path appropriately.
 
-```
-# apt-get install nginx
-```
-
-Once nginx is installed, proceed with the following configuration:
-
 ```
 server {
     listen 80;
@@ -358,7 +352,7 @@ Please keep in mind that the configurations provided here are bare minimums requ
 To add SSL support to the installation we'll start by installing the arbitrary precision calculator language.
 
 ```
-# sudo apt-get -y bc
+# sudo apt-get install -y bc
 ```
 
 Next we'll clone Let's Encrypt into /opt/:

From 2acfe48d8b620d2d99f11b6d41561d1e1d3c69d0 Mon Sep 17 00:00:00 2001
From: ryanmerolle <Ryan.merolle@gmail.com>
Date: Thu, 30 Jun 2016 13:11:43 -0400
Subject: [PATCH 07/12] Update getting-started.md

---
 docs/getting-started.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 59bb341be..08eb07e04 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -235,13 +235,19 @@ If the test service does not run, or you cannot reach the NetBox home page, some
 We'll set up a simple HTTP front end using [gunicorn](http://gunicorn.org/) for the purposes of this guide. For web servers, we provide example configurations for both [nginx](https://www.nginx.com/resources/wiki/) and [Apache](http://httpd.apache.org/docs/2.4). (You are of course free to use whichever combination of HTTP and WSGI services you'd like.) We'll also use [supervisord](http://supervisord.org/) for service persistence. 
 
 ```
-# sudo apt-get install -y gunicorn supervisor apache2 nginx
+# sudo apt-get install -y gunicorn supervisor
 ```
 
 ## nginx Configuration
 
 The following will serve as a minimal nginx configuration. Be sure to modify your server name and installation path appropriately.
 
+```
+# sudo apt-get install -y nginx
+```
+
+Once nginx is installed, proceed with the following configuration:
+
 ```
 server {
     listen 80;
@@ -280,7 +286,11 @@ Restart the nginx service to use the new configuration.
 ```
 ## Apache Configuration
 
-The following configuration should work for Apache. Be sure to modify the `ServerName` appropriately.
+```
+# sudo apt-get install -y apache2
+```
+
+Once Apache is installed, proceed with the following configuration (Be sure to modify the `ServerName` appropriately):
 
 ```
 <VirtualHost *:80>

From 8c61c332776017daa1e489f01444da9c16c68831 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 30 Jun 2016 14:59:52 -0400
Subject: [PATCH 08/12] Wrapped pip updates inside sudo

---
 upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upgrade.sh b/upgrade.sh
index f2f1a5f28..6d30019d9 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -6,7 +6,8 @@
 # gunicorn or uWSGI).
 
 # Install any new Python packages
-pip install -r requirements.txt --upgrade
+echo "Updating required Python packages (pip install -r requirements.txt --upgrade)..."
+sudo pip install -r requirements.txt --upgrade
 
 # Apply any database migrations
 ./netbox/manage.py migrate

From 3becfba9851a1a592eb61aaa4252b2ba2373c2eb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 30 Jun 2016 16:02:18 -0400
Subject: [PATCH 09/12] Fixes #109: Hide navbar for anonymous users when
 LOGIN_REQUIRED = True

---
 netbox/templates/_base.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index 9feb87bde..bb6d8bd8f 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -22,6 +22,7 @@
                 <a class="navbar-brand" href="/">NetBox</a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">
+                {% if request.user.is_authenticated or not settings.LOGIN_REQUIRED %}
                 <ul class="nav navbar-nav">
                     <li class="dropdown{% if request.path|startswith:'/dcim/sites/' %} active{% endif %}">
                         {% if perms.dcim.add_site %}
@@ -207,11 +208,12 @@
                         </li>
                     {% endif %}
                 </ul>
+                {% endif %}
                 <ul class="nav navbar-nav navbar-right">
-                    {% if request.user.is_staff %}
-                        <li><a href="{% url 'admin:index' %}"><i class="glyphicon glyphicon-cog" aria-hidden="true"></i> Admin</a></li>
-                    {% endif %}
                     {% if request.user.is_authenticated %}
+                        {% if request.user.is_staff %}
+                            <li><a href="{% url 'admin:index' %}"><i class="glyphicon glyphicon-cog" aria-hidden="true"></i> Admin</a></li>
+                        {% endif %}
                         <li><a href="{% url 'users:profile' %}"><i class="glyphicon glyphicon-user" aria-hidden="true"></i> Profile</a></li>
                         <li><a href="{% url 'logout' %}"><i class="glyphicon glyphicon-log-out" aria-hidden="true"></i> Log out</a></li>
                     {% else %}

From 9c02bd969f297fd47f3906ba7b33b92d9053fabb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 30 Jun 2016 16:19:48 -0400
Subject: [PATCH 10/12] Fixes #143: Noted that the lowest occupied U is used
 for mounting multi-U devices

---
 docs/dcim.md                             | 6 +++---
 netbox/dcim/forms.py                     | 8 ++++----
 netbox/templates/dcim/device_import.html | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/dcim.md b/docs/dcim.md
index 99fc31653..0b42cc6d9 100644
--- a/docs/dcim.md
+++ b/docs/dcim.md
@@ -59,12 +59,12 @@ Note that assignment of components from templates occurs only at the time of dev
 
 # Devices
 
-Every piece of hardware which is installed within a rack exists in NetBox as a device. Devices are measured in rack units (U) and whether they are full depth. 0U devices which can be installed in a rack but don't consume vertical rack space (such as a vertically-mounted power distribution unit) can also be defined.
+Every piece of hardware which is installed within a rack exists in NetBox as a device. Devices are measured in rack units (U) and depth. 0U devices which can be installed in a rack but don't consume vertical rack space (such as a vertically-mounted power distribution unit) can also be defined.
+
+When assigning a multi-U device to a rack, it is considered to be mounted in the lowest-numbered rack unit which it occupies. For example, a 3U device which occupies U8 through U10 shows as being mounted in U8.
 
 A device is said to be "full depth" if its installation on one rack face prevents the installation of any other device on the opposite face within the same rack unit(s). This could be either because the device is physically too deep to allow a device behind it, or because the installation of an opposing device would impede air flow.
 
-Each device has a physical device type (make and model), which is discussed below.
-
 ### Roles
 
 NetBox allows for the definition of arbitrary device roles by which devices can be organized. For example, you might create roles for core switches, distribution switches, and access switches. In the interest of simplicity, device can only belong to one device role.
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index e9b2f9dac..65b6e77cb 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -326,10 +326,10 @@ class DeviceForm(forms.ModelForm, BootstrapMixin):
         display_field='display_name',
         attrs={'filter-for': 'position'}
     ))
-    position = forms.TypedChoiceField(required=False, empty_value=None, widget=APISelect(
-        api_url='/api/dcim/racks/{{rack}}/rack-units/?face={{face}}',
-        disabled_indicator='device',
-    ))
+    position = forms.TypedChoiceField(required=False, empty_value=None,
+                                      help_text="For multi-U devices, this is the lowest occupied rack unit.",
+                                      widget=APISelect(api_url='/api/dcim/racks/{{rack}}/rack-units/?face={{face}}',
+                                                       disabled_indicator='device'))
     manufacturer = forms.ModelChoiceField(queryset=Manufacturer.objects.all(),
                                           widget=forms.Select(attrs={'filter-for': 'device_type'}))
     device_type = forms.ModelChoiceField(queryset=DeviceType.objects.all(), label='Model', widget=APISelect(
diff --git a/netbox/templates/dcim/device_import.html b/netbox/templates/dcim/device_import.html
index db048c39d..bcc2d0710 100644
--- a/netbox/templates/dcim/device_import.html
+++ b/netbox/templates/dcim/device_import.html
@@ -68,7 +68,7 @@
 				</tr>
 				<tr>
 					<td>Position (U)</td>
-					<td>Numeric rack position (optional)</td>
+					<td>Lowest rack unit occupied by the device (optional)</td>
 					<td>21</td>
 				</tr>
 				<tr>

From 5d2d106b8e95d95ce487523617c3d1785296d0e3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 30 Jun 2016 17:13:55 -0400
Subject: [PATCH 11/12] Fixes #136: Trigger error on prefix w/host bits set
 instead of silently converting it

---
 netbox/ipam/fields.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/netbox/ipam/fields.py b/netbox/ipam/fields.py
index d8478e980..098f753c9 100644
--- a/netbox/ipam/fields.py
+++ b/netbox/ipam/fields.py
@@ -10,7 +10,13 @@ from .lookups import (
 )
 
 
+def prefix_validator(prefix):
+    if prefix.ip != prefix.cidr.ip:
+        raise ValidationError("{} is not a valid prefix. Did you mean {}?".format(prefix, prefix.cidr))
+
+
 class BaseIPField(models.Field):
+    default_validators = [prefix_validator]
 
     def python_type(self):
         return IPNetwork

From eb8a81e22326844f215f15ff4c5abb44bf98a6c5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Thu, 30 Jun 2016 18:04:14 -0400
Subject: [PATCH 12/12] Issue #140: Fixed Unicode bug in message
 (ObjectEditView)

---
 netbox/utilities/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 671390060..49b2bce21 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -137,9 +137,9 @@ class ObjectEditView(View):
             msg = 'Created ' if obj_created else 'Modified '
             msg += self.model._meta.verbose_name
             if hasattr(obj, 'get_absolute_url'):
-                msg += ' <a href="{}">{}</a>'.format(obj.get_absolute_url(), obj)
+                msg = '{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), obj)
             else:
-                msg += ' {}'.format(obj)
+                msg = '{} {}'.format(msg, obj)
             messages.success(request, msg)
             if obj_created:
                 UserAction.objects.log_create(request.user, obj, msg)