Merge pull request #343 from divio/feature/sortedm2m-dragndrop-touch

use jquery.ui.touch-punch correctly
django-cms · May 24, 2016 · 24e4ff3 · 24e4ff3
2 parents 18871e3 + 4f65d50
commit 24e4ff3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.2.1 (Unreleased)
+------------------
+
+* Fixed drag'n'drop on sortedm2m on touch devices
+* Fixed mispositioned elements on tablets
+
 1.2.0 (2016-05-19)
 ------------------
 

diff --git a/djangocms_admin_style/static/djangocms_admin_style/js/jquery.ui.touch-punch.js b/djangocms_admin_style/static/djangocms_admin_style/js/jquery.ui.touch-punch.js
diff --git a/djangocms_admin_style/static/djangocms_admin_style/js/jquery.ui.touch-punch.min.js b/djangocms_admin_style/static/djangocms_admin_style/js/jquery.ui.touch-punch.min.js