Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 44 insertions, 2 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 76edd8b3d..34d7ccd2e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,48 @@
 Ishtar changelog
 ================
 
+v0.99.16 (2017-03-21)
+---------------------
+
+### Features ###
+- Operation: add a location field
+- Operation sheet: add list of containers
+- Operation sheet: add INSEE code to towns
+- Operation source table: change headers
+- Context record: add type of excavation technics
+- Context record form/sheet: add documentation types, diameter and depth of appearance
+- Context records table: add new fields and reorder
+- Find table: add new fields and reorder
+- Find search: conditionnal search (warehouse module available) for warehouses and containers
+- Find search: search by warehouse (location & responsible)
+- Find sheet: link for documents related to finds
+- Warehouse form: can add a warehouse responsible if not available
+- Warehouse/Container sheet: add a Modify button
+- Container: add an image
+- Container wizard: display container sheet at the end of the process
+- Treatment/Treatment file history: navigation between version and restore action
+- Treatment/Treatment file sheet: add source list, administrative act list
+- Basket: add a close button
+- Sources: ordering author by author type
+- Person sheet: link to the attached organization
+- Sheets: remove ":" from labels
+- Sheets: mark explicitly some fields as translated fields
+- Sheets: improve layout
+- Sheets: add ishtar ID
+- Tables: add missing headers
+- Admin: add batch types
+- Imports: admin can see all imports
+- Imports: add a name
+- Imports: clean empty m2m
+- Add a default robots.txt
+
+### Bug fixes ###
+- Refactoring: EXTRA_FULL_FIELDS_LABELS -> COL_LABELS (with merge)
+- Warehouse modification: error message is displayed when putting identical division types
+- Container form: fix message when no warehouse is set
+- Dashboard: fix area unity and effective operation tables
+- Test import of files with exotic encoding
+
 v0.99.15 (2017-03-09)
 ---------------------
 ### Features ###
@@ -37,7 +79,7 @@ v0.99.14 (2017-03-06)
 v0.99.13.1 (2017-02-20)
 -----------------------
 ### Bug fixes ###
-- Warehouse: fix warehouse creation with no divisions (refs #3481)
+- Warehouse: fix warehouse creation with no divisions
 
 v0.99.13 (2017-02-17)
 --------------------
@@ -237,7 +279,7 @@ v0.99.10 (2017-02-04)
 
 ### Bug fixes ###
 
-- Fix simple form for adding containers (refs #3410)
+- Fix simple form for adding containers
 - Treatment file select form: fix treatment file check
 
 0.99.0 (2017-01-10)