From b075239ef28ed305cde0e30c1b357517a6d8fcfb Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 29 Jul 2018 22:52:46 +0200
Subject: [PATCH] Add changelog and cleanup README, upgrade TimeSide and use
 master branch

---
 README.rst   | 55 +++++++++++++++++++++++++++-------------------------
 lib/TimeSide |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/README.rst b/README.rst
index 4b37f95d..8f1abe30 100644
--- a/README.rst
+++ b/README.rst
@@ -37,20 +37,6 @@ It is mostly written in Python, HTML5 and JavaScript.
 
 The *Telemeta* name stands for *Tele* as "remote access" and *meta* for "metadata".
 
-|version| |downloads| |travis_master| |coverage_master|
-
-.. |version| image:: https://img.shields.io/pypi/v/telemeta.svg
-   :target: https://pypi.python.org/pypi/Telemeta/
-   :alt: Version
-
-.. |travis_master| image:: https://secure.travis-ci.org/Parisson/Telemeta.png?branch=master
-   :target: https://travis-ci.org/Parisson/Telemeta/
-   :alt: Travis
-
-.. |coverage_master| image:: https://coveralls.io/repos/Parisson/Telemeta/badge.png?branch=master
-   :target: https://coveralls.io/r/Parisson/Telemeta?branch=master
-   :alt: Coverage
-
 
 Funding and support
 ===================
@@ -66,8 +52,36 @@ Thank you so much for your help!
 
 News
 =====
+
+1.7.0
++++++
+
+* Based on TimeSide 0.9
+* Use Django 1.8
+* Rename some directories
+* Better video streaming
+* Better logging
+
+UPGRADING::
+
+  git pull origin master
+  git submodule update --init --remote
+  docker-compose run app /srv/app/bin/upgrade_from_1.6_to_1.7.sh
+
+**BE CAREFUL**: `scripts/` and `app/scripts/` directories has been renamed `bin/` and `app/bin/` respectively. So please adapt your management and maintenance personal script.
+
+1.6.5 > 1.6.7
++++++++++++++
+
+ * Setting utf8 database by default
+ * Deactivate video.js for now
+ * Use mysql:5
+ * Fix phpmyadmin config
+ * Various bugfixes
+
 1.6.4
 +++++
+
    * Minor bug fixes and improvments
    * Fix HTML5 audio compatibility (#173) for the web audio player. The SoundManager Flash player fallback should not be used in most modern web browser. Media files are now serves through Nginx (#155) which enables to stream music with byte range requests.
    * Add a User permission "can_run_analysis" to specify that a user or a group of users has the right to list and select advanced Timeside analysis to be displayed in the Timeside web audio player.
@@ -139,7 +153,7 @@ Then clone Telemeta::
     git clone --recursive https://github.com/Parisson/Telemeta.git
     cd Telemeta
     docker-compose build
-        
+
 
 Start it up
 ===========
@@ -190,17 +204,6 @@ API / Documentation
 Development
 ===========
 
-|travis_dev| |coverage_dev|
-
-.. |travis_dev| image:: https://secure.travis-ci.org/Parisson/Telemeta.png?branch=dev
-   :target: https://travis-ci.org/Parisson/Telemeta/
-   :alt: Travis
-
-.. |coverage_dev| image:: https://coveralls.io/repos/Parisson/Telemeta/badge.png?branch=dev
-   :target: https://coveralls.io/r/Parisson/Telemeta?branch=dev
-   :alt: Coverage
-
-
 To start the application in a development environment setup, first read / edit `env/debug.env`, then::
 
     cd Telemeta
diff --git a/lib/TimeSide b/lib/TimeSide
index 506b3517..fcfd1c40 160000
--- a/lib/TimeSide
+++ b/lib/TimeSide
@@ -1 +1 @@
-Subproject commit 506b3517fbd981c66372f4b7efce2d333cd2b8d0
+Subproject commit fcfd1c404e907067878e3a75a4ab8f99277be3a6
-- 
2.39.5