Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/plugins/access.fs/fsActions.xml

@@ -820,7 +820,7 @@
 			<gui text="7" title="161" src="editdelete.png" iconClass="icon-trash" accessKey="delete_access_key" hasAccessKey="true" specialAccessKey="delete">
 				<context selection="true" dir="" recycle="false"
 					actionBar="true" contextMenu="false" infoPanel="false"
-					actionBarGroup="change_main" inZip="false">
+					actionBarGroup="change_main,minisite" inZip="false">
 				</context>
 				<selectionContext dir="true" file="true" recycle="false" unique="false" image="false" editable="false"/>
             </gui>

core/src/plugins/core.auth/standard_auth_actions.xml

@@ -80,6 +80,7 @@
 								}
 							};
 							var conn = new Connexion();
+							conn.setMethod('POST');
 							conn.addParameter("get_action", "pass_change");
 							conn.addParameter("old_pass", userOldPass);
 							conn.addParameter("new_pass", userPass);

core/src/plugins/core.notifications/templates/group/en.php

@@ -22,7 +22,7 @@
     "file.add" => "File AJXP_NODE_LABEL add to AJXP_PARENT_PATH",
     "file.delete" => "File AJXP_NODE_LABEL deleted from AJXP_PARENT_PATH",
     "file.change" => "File AJXP_NODE_LABEL modified by AJXP_USER",
-    "file.view" => "File AJXP_NODE_LABEL consulted by AJXP_USER",
+    "file.view" => "File AJXP_NODE_LABEL was consulted by AJXP_USER",
     "file.copy_to" => "AJXP_NODE_LABEL copied to AJXP_TARGET_FOLDER",
     "file.copy_from" => "AJXP_NODE_LABEL copied from AJXP_SOURCE_FOLDER",
     "file.move_to" => "AJXP_NODE_LABEL moved to AJXP_TARGET_FOLDER",

core/src/plugins/core.notifications/templates/long/en.php

@@ -23,7 +23,7 @@
     "file.delete" => "The file AJXP_NODE_LABEL was deleted from AJXP_PARENT_PATH AJXP_DATE, by AJXP_USER.",
     "file.change" => "The file AJXP_NODE_LABEL was modified AJXP_DATE, by AJXP_USER.",
     "file.rename" => "The file AJXP_SOURCE_LABEL was renamed to AJXP_NODE_LABEL AJXP_DATE, by AJXP_USER.",
-    "file.view" => "The file AJXP_NODE_LABEL was consulted by AJXP_USER AJXP_DATE, by AJXP_USER.",
+    "file.view" => "The file AJXP_NODE_LABEL was consulted by AJXP_USER AJXP_DATE.",
     "file.copy" => "The file AJXP_NODE_LABEL was copied from AJXP_SOURCE_FOLDER to AJXP_PARENT_PATH AJXP_DATE, by AJXP_USER.",
     "file.copy_to" => "The file AJXP_NODE_LABEL was copied to AJXP_TARGET_FOLDER AJXP_DATE, by AJXP_USER.",
     "file.copy_from" => "The file AJXP_NODE_LABEL was copied from AJXP_SOURCE_FOLDER AJXP_DATE, by AJXP_USER.",
@@ -41,5 +41,5 @@
     "folder.move" => "The folder AJXP_NODE_LABEL was moved to from AJXP_SOURCE_FOLDER to AJXP_PARENT_PATH AJXP_DATE, by AJXP_USER.",
     "folder.move_to" => "The folder AJXP_NODE_LABEL was moved to AJXP_TARGET_FOLDER AJXP_DATE, by AJXP_USER.",
     "folder.move_from" => "The folder AJXP_NODE_LABEL was moved from AJXP_SOURCE_FOLDER AJXP_DATE, by AJXP_USER.",
-    "ajxp_link" => "Click here to get go directly to <a href='AJXP_LINK'>AJXP_NODE_LABEL</a>",
+    "ajxp_link" => "Click here to go directly to <a href='AJXP_LINK'>AJXP_NODE_LABEL</a>",
 );

core/src/plugins/gui.ajax/res/js/pydio/util/javascript-xpath-cmp.js renamed to core/src/plugins/gui.ajax/res/js/lib/xpath/javascript-xpath-cmp.js

@@ -132,7 +132,7 @@ public function mountFS()
             }
         }
         $UNC_PATH = $this->getOption("UNC_PATH", $user, $password, false);
-        $MOUNT_OPTIONS = $this->getOption("MOUNT_OPTIONS", $user, $password);
+        $MOUNT_OPTIONS = $this->getOption("MOUNT_OPTIONS", $user, $password, false);
 
         $cmd = ($MOUNT_SUDO? "sudo ": ""). "mount -t " .$MOUNT_TYPE. (empty( $MOUNT_OPTIONS )? " " : " -o " .escapeshellarg($MOUNT_OPTIONS). " " ) .escapeshellarg($UNC_PATH). " " .escapeshellarg($MOUNT_POINT);
         $res = null;