Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git#master

debian/mahara-apache.postinst

@@ -64,7 +64,7 @@ case "$1" in
 
         if [ -n "${RET}" ]; then
             echo '<VirtualHost *>' >> $APACHE_CONF_FILE
-            echo ${RET} | perl -ne '@s = split /\s*,\s*/; print "    ServerName ", shift @s, "\n" if @s; print map { "  ServerAlias $_\n" } @s;' >> $APACHE_CONF_FILE
+            echo ${RET} | perl -ne '@s = split /\s*,\s*/; print "    ServerName ", shift @s, "\n" if @s; print map { "    ServerAlias $_\n" } @s;' >> $APACHE_CONF_FILE
             db_get mahara/servername
             echo "    Redirect Permanent / http://${RET}" >> $APACHE_CONF_FILE
             echo '</VirtualHost>' >> $APACHE_CONF_FILE

debian/mahara-apache2.postinst

@@ -65,7 +65,7 @@ case "$1" in
 
         if [ -n "${RET}" ]; then
             echo '<VirtualHost *>' >> $APACHE_CONF_FILE
-            echo ${RET} | perl -ne '@s = split /\s*,\s*/; print "    ServerName ", shift @s, "\n" if @s; print map { "  ServerAlias $_\n" } @s;' >> $APACHE_CONF_FILE
+            echo ${RET} | perl -ne '@s = split /\s*,\s*/; print "    ServerName ", shift @s, "\n" if @s; print map { "    ServerAlias $_\n" } @s;' >> $APACHE_CONF_FILE
             db_get mahara/servername
             echo "    Redirect Permanent / http://${RET}" >> $APACHE_CONF_FILE
             echo '</VirtualHost>' >> $APACHE_CONF_FILE

htdocs/js/MochiKit/Visual.js

@@ -497,9 +497,14 @@ MochiKit.Visual.Transitions.wobble = function (pos) {
 };
 
 /** @id MochiKit.Visual.Transitions.pulse */
-MochiKit.Visual.Transitions.pulse = function (pos) {
-    return (Math.floor(pos*10) % 2 === 0 ?
-        (pos*10 - Math.floor(pos*10)) : 1 - (pos*10 - Math.floor(pos*10)));
+MochiKit.Visual.Transitions.pulse = function (pos, pulses) {
+    if (!pulses) {
+        return (Math.floor(pos*10) % 2 === 0 ?
+            (pos*10 - Math.floor(pos*10)) : 1 - (pos*10 - Math.floor(pos*10)));
+    }
+    return (Math.round((pos % (1/pulses)) * pulses) == 0 ?
+            ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) :
+        1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2)));
 };
 
 /** @id MochiKit.Visual.Transitions.none */
@@ -1874,7 +1879,7 @@ MochiKit.Visual.pulsate = function (element, /* optional */ options) {
     }, options || {});
     var transition = options.transition || v.Transitions.sinoidal;
     var reverser = b.bind(function (pos) {
-        return transition(1 - v.Transitions.pulse(pos));
+        return transition(1 - v.Transitions.pulse(pos, options.pulses));
     }, transition);
     b.bind(reverser, transition);
     return new v.Opacity(element, b.update({

htdocs/json/help.php

@@ -63,9 +63,9 @@ else if (!empty($form) && empty($element)) {
 }
 else {
     if ($page) {
-        json_reply(true, get_string('nohelpfoundpage'));
+        json_reply('local', get_string('nohelpfoundpage'));
     }
-    json_reply(true, get_string('nohelpfound'));
+    json_reply('local', get_string('nohelpfound'));
 }
 
 // now we have to try and locate the help file
@@ -106,7 +106,7 @@ if (empty($data) && empty($trieden)) {
 }
 
 if (empty($data)) {
-    json_reply(true, get_string('nohelpfound'));
+    json_reply('local', get_string('nohelpfound'));
 }
 
 $json = array('error' => false, 'content' => $data);