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, 16 insertions, 2 deletions

diff --git a/library/jRange/demo/index.html b/library/jRange/demo/index.html
index ac443f11f..19a5f33f0 100644
--- a/library/jRange/demo/index.html
+++ b/library/jRange/demo/index.html
@@ -41,7 +41,7 @@
     from: 0,
     to: 100,
     step: 1,
-    scale: [0,50,100],
+    scale: [0,25,50,75,100],
     format: '%s',
     width: 300,
     showLabels: true
@@ -181,6 +181,20 @@
                         </td>
                     </tr>
                     <tr>
+                        <td>disable</td>
+                        <td>Optional</td>
+                        <td>Boolean</td>
+                        <td>
+                            <code>Default : false</code>
+                            <p>True if this is a disable(read only) range selector. You can also change disable status later by calling. </p>
+                            <code>
+                                $('.slider').jRange('disable');
+                                $('.slider').jRange('enable');
+                                $('.slider').jRange('toggleDisable');
+                            </code>
+                        </td>
+                    </tr>
+                    <tr>
                         <td>onstatechange</td>
                         <td>Optional</td>
                         <td>Function</td>
@@ -242,4 +256,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>