L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-30341' of git://github.com/scriby/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-21 01:11:54 +01:00
parent 253f5575c9 aeae316274
commit 0fca3dbbce
24 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lti/ajax.php
+4 -2
View File
@@ -15,12 +15,14 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* AJAX service used when adding an External Tool to provide immediate feedback
* of which tool provider is to be used based on the Launch URL.
*
* @package mod
* @subpackage xml
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
require_once(dirname(__FILE__) . "/../../config.php");
mod/lti/backup/moodle1/lib.php
+24
View File
@@ -1,4 +1,28 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* 1.9 to 2.0 backup format converter. (Also currently used in common cartridge import process)
*
* @package mod
* @subpackage lti
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Darko Miletic
*/
defined('MOODLE_INTERNAL') || die();
mod/lti/db/access.php
+1
View File
@@ -25,6 +25,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/edit_form.php
+1
View File
@@ -44,6 +44,7 @@
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Charles Severance
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/grade.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/index.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
require_once("../../config.php");
mod/lti/instructor_edit_tool_type.php
+3 -2
View File
@@ -15,12 +15,13 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* This page allows instructors to configure course level tool providers.
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
require_once('../../config.php');
mod/lti/lang/en/lti.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/launch.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/lib.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/localadminlib.php
+1
View File
@@ -44,6 +44,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/locallib.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/mod_form.js
+2 -2
View File
@@ -14,11 +14,11 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* Javascript extensions for the External Tool activity editor.
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
(function(){
mod/lti/mod_form.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/request_tool.php
+3 -2
View File
@@ -15,12 +15,13 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* Submits a request to administrators to add a tool configuration for the requested site.
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
require_once('../../config.php');
mod/lti/return.php
+2 -1
View File
@@ -19,8 +19,9 @@
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
require_once('../../config.php');
mod/lti/service.php
+3 -2
View File
@@ -15,12 +15,13 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* LTI web service endpoints
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
require_once(dirname(__FILE__) . "/../../config.php");
mod/lti/servicelib.php
+3 -2
View File
@@ -15,12 +15,13 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* Utility code for LTI service handling.
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
defined('MOODLE_INTERNAL') || die;
mod/lti/settings.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/simpletest/testlocallib.php
+1
View File
@@ -44,6 +44,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/submissions.js
+3 -2
View File
@@ -14,12 +14,13 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* MRTODO: Brief description of this file
* Javascript extensions for LTI submission viewer.
*
* @package mod
* @subpackage lti
* @copyright 2011 onwards MRTODO
* @copyright Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Chris Scribner
*/
(function(){
var Y;
mod/lti/typessettings.php
+1
View File
@@ -44,6 +44,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/version.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/lti/view.php
+1
View File
@@ -43,6 +43,7 @@
* @author Marc Alier
* @author Jordi Piguillem
* @author Nikolas Galanis
* @author Chris Scribner
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/