Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 6 insertions, 3 deletions

diff --git a/library/jRange/jquery.range.less b/library/jRange/jquery.range.less
index cb6e12288..4034bdd66 100644
--- a/library/jRange/jquery.range.less
+++ b/library/jRange/jquery.range.less
@@ -70,7 +70,7 @@
             width: 10px;
             height: 10px;
             background-color: red;
-            cursor: move;
+            cursor: col-resize;
             opacity: 1;
             z-index: 2;
             &.last-active{
@@ -115,6 +115,11 @@
             line-height: 1;
         }
     }
+    &.slider-readonly{
+        .clickable-dummy, .pointer {
+            cursor: auto;
+        }
+    }
 }
 .theme-green {
     .back-bar {
@@ -136,7 +141,6 @@
             border-radius: 10px;
             border: 1px solid #AAA;
             #gradient > .vertical(#eeeeee, #dddddd);
-            cursor: col-resize;
         }
         .pointer-label {
             color: #999;
@@ -175,7 +179,6 @@
             border-radius: 10px;
             border: 1px solid #AAA;
             #gradient > .vertical(#eeeeee, #dddddd);
-            cursor: col-resize;
         }
         .pointer-label {
             color: #999;