Browse Source

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Yannick Warnier 6 years ago
parent
commit
e084986af2

+ 6 - 7
app/Resources/public/assets/multiselect/.bower.json → app/Resources/public/assets/multiselect-two-sides/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "multiselect",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "homepage": "https://github.com/crlcu/multiselect",
   "authors": [
     "Adrian Crisan <adrian.crisan88@gmail.com>"
@@ -14,14 +14,13 @@
   "dependencies": {
     "jquery": ">= 1.7"
   },
-  "_release": "2.5.1",
+  "_release": "2.5.2",
   "_resolution": {
     "type": "version",
-    "tag": "v2.5.1",
-    "commit": "b392a4e3233155703561880da8af177ea67cc408"
+    "tag": "v2.5.2",
+    "commit": "5d850b4a2992dbab1cf913559da0d2398f5db30f"
   },
   "_source": "https://github.com/crlcu/multiselect.git",
-  "_target": "^2.5.1",
-  "_originalSource": "multiselect-two-sides",
-  "_direct": true
+  "_target": "*",
+  "_originalSource": "multiselect-two-sides"
 }

+ 0 - 0
app/Resources/public/assets/multiselect/.gitignore → app/Resources/public/assets/multiselect-two-sides/.gitignore


+ 15 - 1
app/Resources/public/assets/multiselect/CHANGELOG.md → app/Resources/public/assets/multiselect-two-sides/CHANGELOG.md

@@ -2,13 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="2.5.2"></a>
+## [2.5.2](https://github.com/crlcu/multiselect/compare/v2.5.1...v2.5.2) (2018-07-10)
+
+
+### Bug Fixes
+
+* [#164](https://github.com/crlcu/multiselect/issues/164) - Invalid regular expression ([541bb68](https://github.com/crlcu/multiselect/commit/541bb68))
+
+
+
 <a name="2.5.1"></a>
 ## [2.5.1](https://github.com/crlcu/multiselect/compare/v2.5.0...v2.5.1) (2018-04-27)
 
 
+### Patches
+
+* change the value for the main path ([22414f8](https://github.com/crlcu/multiselect/commit/22414f8))
+
 ### Features
 
-* now we can have different sort functions for left and right ([d5fc6a1](https://github.com/crlcu/multiselect/commit/d5fc6a1))
+* add afterInit event ([22e1523](https://github.com/crlcu/multiselect/commit/22e1523))
 
 
 

+ 0 - 0
app/Resources/public/assets/multiselect/LICENSE → app/Resources/public/assets/multiselect-two-sides/LICENSE


+ 0 - 0
app/Resources/public/assets/multiselect/README.md → app/Resources/public/assets/multiselect-two-sides/README.md


+ 1 - 1
app/Resources/public/assets/multiselect/bower.json → app/Resources/public/assets/multiselect-two-sides/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "multiselect",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "homepage": "https://github.com/crlcu/multiselect",
   "authors": [
     "Adrian Crisan <adrian.crisan88@gmail.com>"

+ 0 - 0
app/Resources/public/assets/multiselect/css/style.css → app/Resources/public/assets/multiselect-two-sides/css/style.css


+ 2 - 2
app/Resources/public/assets/multiselect/dist/js/multiselect.js → app/Resources/public/assets/multiselect-two-sides/dist/js/multiselect.js

@@ -1,7 +1,7 @@
 /*
  * @license
  *
- * Multiselect v2.5.0
+ * Multiselect v2.5.2
  * http://crlcu.github.io/multiselect/
  *
  * Copyright (c) 2016-2018 Adrian Crisan
@@ -805,7 +805,7 @@ if (typeof jQuery === 'undefined') {
     };
 
     $.expr[":"].search = function(elem, index, meta) {
-        var regex = new RegExp(meta[3], "i");
+        var regex = new RegExp(meta[3].replace(/([^a-zA-Z0-9])/g, "\\$1"), "i");
 
         return $(elem).text().match(regex);
     }

File diff suppressed because it is too large
+ 0 - 0
app/Resources/public/assets/multiselect-two-sides/dist/js/multiselect.min.js


+ 1 - 1
app/Resources/public/assets/multiselect/index.html → app/Resources/public/assets/multiselect-two-sides/index.html

@@ -4,7 +4,7 @@
     <meta name="description" lang="en" content="jQuery multiselect plugin with two sides. The user can select one or more items and send them to the other side."/>
     <meta name="keywords" lang="en" content="jQuery multiselect plugin" />
 
-    <base href="http://crlcu.github.io/multiselect/" />
+    <base href="//crlcu.github.io/multiselect/" />
 
     <title>jQuery multiselect plugin with two sides</title>
     

File diff suppressed because it is too large
+ 225 - 225
app/Resources/public/assets/multiselect-two-sides/package-lock.json


+ 1 - 1
app/Resources/public/assets/multiselect/package.json → app/Resources/public/assets/multiselect-two-sides/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multiselect-two-sides",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "jQuery multiselect plugin with two sides",
   "main": "dist/js/multiselect.min.js",
   "scripts": {

+ 1 - 1
main/inc/lib/pear/HTML/QuickForm/advmultiselect.php

@@ -917,7 +917,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
     public function getElementJs($raw = true, $min = true)
     {
         $name = $this->getName();
-        $js = api_get_asset('multiselect/dist/js/multiselect.js');
+        $js = api_get_asset('multiselect-two-sides/dist/js/multiselect.js');
         $search =
         '<input type="text" name="q" class="form-control" placeholder="'.addslashes(get_lang('Search')).'" /><br />';
 

+ 18 - 12
plugin/ims_lti/form.php

@@ -79,16 +79,22 @@ $result = $oauth->sign(array(
 ?>
 <!DOCTYPE html>
 <html>
-    <head>
-        <title>title</title>
-    </head>
-    <body>
-        <form action="<?php echo $result['signed_url'] ?>" name="ltiLaunchForm" method="post" encType="application/x-www-form-urlencoded">
-            <input type="submit" value="Press to continue to external tool"/>
-        </form>
-
-        <script language="javascript">
-            document.ltiLaunchForm.submit();
-        </script>
-    </body>
+<head>
+    <title>title</title>
+</head>
+<body>
+<form action="<?php echo $tool->getLaunchUrl() ?>" name="ltiLaunchForm" method="post"
+      encType="application/x-www-form-urlencoded">
+    <?php
+    foreach ($result["parameters"] as $key => $values) { //Dump parameters
+        echo '<input type="hidden" name="'.$key.'" value="'.$values.'" />';
+    }
+    ?>
+    <input type="submit" value="Press to continue to external tool"/>
+</form>
+
+<script language="javascript">
+    document.ltiLaunchForm.submit();
+</script>
+</body>
 </html>

+ 13 - 13
tests/behat/features/toolLp.feature

@@ -54,19 +54,19 @@ Feature: LP tool
     And I follow "Delete"
     Then I should not see "LP category 1"
 
-  Scenario: Check the PDF export in LP list if hide SCORM PDF link is false
-    Given I am on "/main/admin/settings.php?category=Course"
-    And I check the "hide_scorm_pdf_link" radio button with "false" value
-    And I press "Save settings"
-    And I am on "/main/lp/lp_controller.php?cidReq=TEMP&action=list&isStudentView=true"
-    Then I should see an icon with title "Export to PDF"
-
-  Scenario: Check the PDF export in LP list if hide SCORM PDF link is true
-    Given I am on "/main/admin/settings.php?category=Course"
-    And I check the "hide_scorm_pdf_link" radio button with "true" value
-    And I press "Save settings"
-    And I am on "/main/lp/lp_controller.php?cidReq=TEMP&action=list&isStudentView=true"
-    Then I should not see an icon with title "Export to PDF"
+#  Scenario: Check the PDF export in LP list if hide SCORM PDF link is false
+#    Given I am on "/main/admin/settings.php?category=Course"
+#    And I check the "hide_scorm_pdf_link" radio button with "false" value
+#    And I press "Save settings"
+#    And I am on "/main/lp/lp_controller.php?cidReq=TEMP&action=list&isStudentView=true"
+#    Then I should see an icon with title "Export to PDF"
+#
+#  Scenario: Check the PDF export in LP list if hide SCORM PDF link is true
+#    Given I am on "/main/admin/settings.php?category=Course"
+#    And I check the "hide_scorm_pdf_link" radio button with "true" value
+#    And I press "Save settings"
+#    And I am on "/main/lp/lp_controller.php?cidReq=TEMP&action=list&isStudentView=true"
+#    Then I should not see an icon with title "Export to PDF"
 
   Scenario: Delete a LP
     Given I am on "/main/lp/lp_controller.php?cidReq=TEMP&action=list"

Some files were not shown because too many files changed in this diff