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

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

Browse Source
This commit is contained in:
Damyon Wiese
2014-02-24 15:26:05 +08:00
parent 28a03399b3 593b838546
commit 6258e288ae
44 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/admin.php
+1 -1
View File
@@ -22,7 +22,7 @@
* If user have wiki:managewiki ability then only this page will show delete
* options
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2011 Rajesh Taneja
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/wiki/backup/moodle1/lib.php
+1 -2
View File
@@ -19,8 +19,7 @@
* Provides support for the conversion of moodle1 backup to the moodle2 format
* Based off of a template @ http://docs.moodle.org/dev/Backup_1.9_conversion_for_developers
*
* @package mod
* @subpackage wiki
* @package mod_wiki
* @copyright 2011 Aparup Banerjee <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/wiki/backup/moodle2/backup_wiki_settingslib.php
+1 -1
View File
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package moodlecore
* @package mod_wiki
* @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
mod/wiki/backup/moodle2/backup_wiki_stepslib.php
+1 -1
View File
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package moodlecore
* @package mod_wiki
* @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
mod/wiki/backup/moodle2/restore_wiki_activity_task.class.php
+1 -1
View File
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package moodlecore
* @package mod_wiki
* @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
mod/wiki/backup/moodle2/restore_wiki_stepslib.php
+1 -1
View File
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package moodlecore
* @package mod_wiki
* @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
mod/wiki/comments.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to view a discussion page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/create_form.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to define and process an edit form
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2010 Dongsheng Cai <[email protected]>
*
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
mod/wiki/db/upgrade.php
+1 -1
View File
@@ -26,7 +26,7 @@
* to perform all the necessary actions to upgrade
* your older installation to the current version.
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/diff.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to view a diff page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/edit.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to edit a wiki page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/edit_form.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to define and process an edit form
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/editcomments.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/editors/html.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arus
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*
*/
mod/wiki/editors/wiki_editor.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Kenneth Riba
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*
*/
mod/wiki/editors/wikieditor.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
* This file contains all necessary code to define a wiki editor
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/editors/wikifiletable.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
* This file contains all necessary code to define a wiki file table form element
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/files.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
* Wiki files management
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2011 Dongsheng Cai <[email protected]>
*
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
mod/wiki/filesedit.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
* Manage files in wiki
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2011 Dongsheng Cai <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/wiki/filesedit_form.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
* Edit wiki files form
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2011 Dongsheng Cai <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/wiki/history.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to view the history page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/index.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This page lists all the instances of wiki in a particular course
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/instancecomments.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* @TODO: Doc this file
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/lang/en/wiki.php
+1 -1
View File
@@ -7,7 +7,7 @@
* @author Kenneth Riba
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
$string['addcomment'] = 'Add comment';
$string['admin'] = 'Administration';
mod/wiki/lib.php
+1 -1
View File
@@ -21,7 +21,7 @@
* It contains the great majority of functions defined by Moodle
* that are mandatory to develop a module.
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/locallib.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This contains functions and classes that will be used by scripts in wiki module
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/lock.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to execute a lock renewal based on an ajax call
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/map.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to view the navigation tab
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/mod_form.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file defines de main wiki configuration form
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/overridelocks.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to edit a wiki page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/pagelib.php
+1 -1
View File
@@ -19,7 +19,7 @@
* This file contains several classes uses to render the diferent pages
* of the wiki module
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/parser/markups/creole.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arús
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
include_once("wikimarkup.php");
mod/wiki/parser/markups/html.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arús
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
include_once("nwiki.php");
mod/wiki/parser/markups/nwiki.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arús
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
include_once("wikimarkup.php");
mod/wiki/parser/markups/wikimarkup.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arús
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
abstract class wiki_markup_parser extends generic_parser {
mod/wiki/parser/parser.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arús
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
class wiki_parser_proxy {
mod/wiki/parser/utils.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @author Josep Arús
*
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package wiki
* @package mod_wiki
*/
require_once($CFG->dirroot . "/lib/outputcomponents.php");
mod/wiki/prettyview.php
+1 -1
View File
@@ -17,7 +17,7 @@
/**
* This file contains all necessary code to get a printable version of a wiki page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/renderer.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* Moodle Wiki 2.0 Renderer
*
* @package mod-wiki
* @package mod_wiki
* @copyright 2010 Dongsheng Cai <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/wiki/restoreversion.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file renders the restoring wikipage HTML
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/search.php
+1 -1
View File
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* @package mod-wiki
* @package mod_wiki
* @copyright 2010 Dongsheng Cai <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
mod/wiki/version.php
+1 -1
View File
@@ -18,7 +18,7 @@
* Code fragment to define the version of wiki
* This fragment is called by moodle_needs_upgrading() and /admin/index.php
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/view.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to view a wiki page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*
mod/wiki/viewversion.php
+1 -1
View File
@@ -18,7 +18,7 @@
/**
* This file contains all necessary code to view an old version of a page
*
* @package mod-wiki-2.0
* @package mod_wiki
* @copyright 2009 Marc Alier, Jordi Piguillem [email protected]
* @copyright 2009 Universitat Politecnica de Catalunya http://www.upc.edu
*