From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 20 Nov 2014 17:22:04 +0000 (+0100)
Subject: Merge branch 'dj1.6' into dev
X-Git-Tag: 1.5.0rc1~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5274f462fcde8359b38d14b495b4274941a0d7ea;p=telemeta.git

Merge branch 'dj1.6' into dev

Conflicts:
	README.rst
---

5274f462fcde8359b38d14b495b4274941a0d7ea
diff --cc README.rst
index 70208ff1,d20fd51c..db40e035
--- a/README.rst
+++ b/README.rst
@@@ -2,6 -2,23 +2,23 @@@
  Telemeta: open web audio app with semantics
  ===============================================
  
+ |version| |downloads| |travis_master| |coverage|
+ 
+ .. |travis_master| image:: https://secure.travis-ci.org/Parisson/Telemeta.png?branch=master
+    :target: https://travis-ci.org/Parisson/Telemeta/
+ 
+ .. |version| image:: https://pypip.in/version/Telemeta/badge.png
+    :target: https://pypi.python.org/pypi/Telemeta/
+    :alt: Version
+ 
+ .. |downloads| image:: https://pypip.in/download/Telemeta/badge.svg
+    :target: https://pypi.python.org/pypi/Telemeta/
+    :alt: Downloads
+ 
 -.. |coverage| image:: https://img.shields.io/coveralls/Parisson/Telemeta.svg 
++.. |coverage| image:: https://img.shields.io/coveralls/Parisson/Telemeta.svg
+    :target: https://coveralls.io/r/Parisson/Telemeta?branch=dj1.6
+    :alt: Coverage
+ 
  Overview
  =========
  
@@@ -42,6 -59,6 +59,15 @@@ See `INSTALL.rst <http://github.com/yom
  News
  ======
  
++1.5
+++++++
++
++ * Compatible with Django 1.6.x
++ * Huge refactor of all forms, detail and edit views
++ * Main styles are now based Bootstrap 3.x
++ * Update models thanks to the CREM needs
++ * Compatible with TimeSide 0.6.x
++
  1.4.6
  +++++