Merge branch 'develop' of https://github.com/sanoma/django-arctic int…

…o feature/hability-to-disable-forms

# Conflicts:
#	arctic/templates/arctic/base_create_update.html

.gitignore

@@ -17,6 +17,7 @@ eggs/
 lib/
 lib64/
 parts/
+dist/
 sdist/
 var/
 *.egg-info/
@@ -119,6 +120,8 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 
+*.sublime-workspace
+
 # Virtualenv
 venv/
 venv3/

.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: python
-python: 3.5
+python: 3.6
 python:
+  - 3.6
   - 3.5
-  - 3.4
   - 2.7
 matrix:
   fast_finish: true

CHANGELOG.md

@@ -1,12 +1,43 @@
 #Changelog
 
-Arctic uses semantic versioning - please refer to <http://semver.org> for further details.
+All notable changes to this project will be documented in this file.
 
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+Always reference the ticket number at the end of the issue description.
+
+##Unreleased
+
+###Changed
+
+- Added full Django 1.10 compatibility - [#164][164]
+- Added submenu icons display option - [#178][178]
+- Considerate improved performance; no query per has_permission call - [#182][182]
+
+[164]: //github.com/sanoma/django-arctic/issues/164
+[178]: //github.com/sanoma/django-arctic/issues/178
+[182]: //github.com/sanoma/django-arctic/issues/182
+
+
+##0.9.4 (2017-02-23)
+
+###Changed
+
+- Simplified the frontend tooling, removing Bower and foundation-cli, setup is 
+  now based on npm and gulp - [#161][161]
+
+###Fixed
+
+- In the listview, don't generate NoReverseMatch exception if any value of 
+  the arguments is None.
+
+[161]: //github.com/sanoma/django-arctic/issues/161
 
 
 ##0.9.3 (2016-10-27)
 
-###Changes
+###Changed
 
 - `FormView`, `CreateView` and `UpdateView` added a `layout` property to 
   easily customize positioning and width of form fields - [#75][75]

MANIFEST.in

@@ -6,5 +6,5 @@ recursive-include arctic/templates *.html
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 prune arctic/static/arctic/node_modules
-prune arctic/static/arctic/bower_components
+prune arctic/static/arctic/node_modules
 prune arctic/static/arctic/src

README.md

@@ -1,7 +1,7 @@
 # Django Arctic
 [![PyPi version](https://img.shields.io/pypi/v/django-arctic.svg)](https://pypi.python.org/pypi/django-arctic/)
-[![Travis CI](https://api.travis-ci.org/sanoma/django-arctic.svg)](https://travis-ci.org/sanoma/django-arctic/)
-[![Coverage Status](https://coveralls.io/repos/github/sanoma/django-arctic/badge.svg?branch=master)](https://coveralls.io/github/sanoma/django-arctic?branch=master)
+[![Build Status](https://travis-ci.org/sanoma/django-arctic.svg?branch=develop)](https://travis-ci.org/sanoma/django-arctic)
+[![Coverage Status](https://coveralls.io/repos/github/sanoma/django-arctic/badge.svg?branch=develop)](https://coveralls.io/github/sanoma/django-arctic)
 [![Read the Docs](https://readthedocs.org/projects/django-arctic/badge/?version=latest)](https://django-arctic.readthedocs.io/en/latest/)
 
 Django Arctic is a framework that simplifies the creation of custom content management systems.
@@ -25,7 +25,7 @@ Instead of being a ready-to-use CMS, Arctic is a framework that facilitates the
 
 ## Compatibility
 
-* Python 2.7, 3.4, 3.5
+* Python 2.7, 3.5, 3.6
 * Django 1.8, 1.9, 1.10
 
 ## Features