Merge branch '41179-27' of git://github.com/samhemelryk/moodle

This commit is contained in:
Damyon Wiese
2014-02-24 14:51:08 +08:00
14 changed files with 14 additions and 25 deletions
+1 -2
View File
@@ -18,8 +18,7 @@
/**
* Provides support for the conversion of moodle1 backup to the moodle2 format
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2011 Andrew Davis <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -16,8 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package moodlecore
* @package mod_page
* @subpackage backup-moodle2
* @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package moodlecore
* @package mod_page
* @subpackage backup-moodle2
* @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+1 -2
View File
@@ -23,8 +23,7 @@
* - lib.php/modulename_install() post installation hook
* - partially defaults.php
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -38,8 +38,7 @@
* Please do not forget to use upgrade_set_timeout()
* before any action that may take longer time to finish.
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -18,8 +18,7 @@
/**
* List of all pages in course
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* Strings for component 'page', language 'en', branch 'MOODLE_20_STABLE'
*
* @package page
* @package mod_page
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -16,8 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -18,8 +18,7 @@
/**
* Private page module utility functions
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -18,8 +18,7 @@
/**
* Page configuration form
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -18,8 +18,7 @@
/**
* Page module admin settings and defaults
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -17,8 +17,7 @@
/**
* Page module version information
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+1 -2
View File
@@ -18,8 +18,7 @@
/**
* Page module version information
*
* @package mod
* @subpackage page
* @package mod_page
* @copyright 2009 Petr Skoda (http://skodak.org)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/