mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 16:59:56 +01:00
Code Issues Projects Releases Wiki Activity
48,386 Commits 36 Branches 523 Tags
Commit Graph

10800 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
4561302dec MDL-20636 Prepare stuff for cleaner merging 2011-06-06 16:38:23 +01:00
David Mudrak
b34b969103 MDL-27734 Fixed weights of the example submission assessments 2011-06-06 17:37:59 +02:00
David Mudrak
ce8157ed91 MDL-27733 workshop: keep the phase deadlines during the 1.9 => 2.0 upgrade 2011-06-06 17:36:32 +02:00
David Mudrak
7e1450977e MDL-27732 Include the introformat field in the glossary module backups 2011-06-06 15:19:41 +02:00
David Mudrak
fe50f530fd MDL-27379 Backup conversion logging facilities 2011-06-06 13:56:06 +02:00
David Mudrak
1b85912abb MDL-27729 Glossary module 1.9 backup converts to 2.0 format 2011-06-06 10:11:58 +02:00
Eloy Lafuente (stronk7)
b04aa92544 MDL-27724 wiki - update commented upgrade step to avoid future problems 2011-06-05 19:47:38 +02:00
David Mudrak
c5c315e2a7 MDL-27718 Migrate files embedded in the activity intro fields 
Contains various fixed spotted through the way, too.
 2011-06-05 17:37:58 +02:00
David Mudrak
02e9095677 MDL-27448 IMS content package module conversion improved 
The files embedded into the intro field and the backup of the original
content package are migrated now, too.
 2011-06-04 22:12:47 +02:00
David Mudrak
85d91b6a1b MDL-27448 Do not stop conversion because of missing course files 2011-06-04 22:11:03 +02:00
David Mudrak
baa44e3d3d MDL-27448 Simplified migration of the files embedded in the resources HTML texts 2011-06-04 21:13:56 +02:00
David Mudrak
afb4494bd0 MDL-27448 URL resource module backup conversion improved 
The patch also fixes invalid 'course' field in moodle2 backup code.
 2011-06-04 21:04:02 +02:00
David Mudrak
351bf4826c MDL-27448 Improved resource module converter 2011-06-04 20:03:28 +02:00
David Mudrak
aa97e0dd52 MDL-22414 File manager allows to set explicit sortorder and accepts filepaths not ending with a slash 
We want to set migrated content file in the File module as a main file.
Main files are files with sortorder set to 1. Therefore the file manager
must provide a way to set the sortorder property of the new file record.

The second change allowing filepaths not ending with slash is a helper
as we can easily use dirname() as a value (see the usage in the next
commits). Not providing the dirname() was a bug as the reference to a
file in the HTML text did not respect the migrated file path.
 2011-06-04 20:02:03 +02:00
David Mudrak
93dd33b405 MDL-27448 Folder module conversion improved 2011-06-04 18:28:58 +02:00
David Mudrak
9b2ab50d27 MDL-27448 Page module conversion improved 2011-06-04 18:28:35 +02:00
David Mudrak
9e3e8c8004 MDL-27448 Changed the interface of resource module successors to make it clear they are a special case 2011-06-04 16:11:59 +02:00
David Mudrak
48fcecffb6 MDL-27448 Page module conversion fixed and improved 
The embedded files are now converted into the proper file area on the
conversion. The previous usage of $CFG->wwwroot/file.php was wrong for two
reasons: (1) the moodle.xml does not (should not) contain these links but
$@FILEPHP@$ placeholder and (2) even if it did, we could not compare to
our wwwroot but to the original wwwroot.

Also fixed the actual list of fields being written into page.xml - the
previous version included legacy fields (like type, reference and
friends).
 2011-06-04 14:43:04 +02:00
David Mudrak
b2e905102a MDL-27448 Pretty pedantic fix of using spaces in the code 2011-06-04 14:42:07 +02:00
David Mudrak
904888daee MDL-27448 Resource intro (legacy summary) field converted consistently by the resource handler 2011-06-04 13:24:03 +02:00
David Mudrak
069b5b80c4 MDL-27448 Fixed copyright and phpdoc info 2011-06-04 13:24:03 +02:00
David Mudrak
56bd82cceb MDL-27448 IMS content package converter checks that the manifest file exists 2011-06-04 13:24:03 +02:00
Andrew Davis
5da3af58a0 MDL-27448 resource conversion support to restore 1.9 backup to 2.1 2011-06-04 13:24:03 +02:00
Aparup Banerjee
61ff1fecc3 MDL-27451 Backup - added 1.9 backup conversion handler for wiki 2011-06-03 15:09:15 +08:00
Dongsheng Cai
12c9bbbdd2 MDL-26392 WIKI added file managment support to wiki editor 2011-06-03 11:22:18 +08:00
Aparup Banerjee
4b2da7cee0 MDL-27447 Backup - improvements to 1.9 quiz backup converter 2011-06-02 10:35:08 +08:00
Aparup Banerjee
63e9bb60e6 MDL-27447 Backup - added quiz module 1.9 backup converter 2011-06-02 10:35:08 +08:00
Sam Hemelryk
e455bdb3d7 MDL-27638 Removed buggy status line from query as it is being calculated in php anyway 2011-05-31 17:02:17 +08:00
David Mudrák
193407a096 Merge pull request #9 from nebgor/MDL-27449 
MDL-27449 SCORM module 1.9 converter
 2011-05-30 23:35:26 -07:00
Aparup Banerjee
a1cac902ec MDL-27449 Backup - migrating scorm file within scorm module 1.9 backup converter 2011-05-31 11:29:48 +08:00
David Mudrák
ba1e221a0d Merge pull request #7 from rwijaya/MDL-27441b 
MDL-27441 mod_feedback 1.9 backup conversion
 2011-05-30 16:26:18 -07:00
Aparup Banerjee
0e7269d11d MDL-27449 Backup - added scorm module 1.9 backup converter 2011-05-30 14:20:35 +08:00
Rossiani Wijaya
a6486a827f MDL-27441 mod_feedback: added conversion code to restore 1.9 backup to 2.1 site 2011-05-30 11:29:13 +08:00
Rossiani Wijaya
b44739c868 MDL-27446 mod_lesson: added conversion code to restore 1.9 backup to 2.1 site 2011-05-30 10:56:31 +08:00
Tim Hunt
60006d2971 MDL-20636 remove bogus include that breaks cron. 2011-05-27 20:43:20 +01:00
David Mudrák
64f7da2402 Merge pull request #2 from rwijaya/MDL-27450 
MDL-27450 mod_survey: added conversion code to restore 1.9 backup to 2.1
 2011-05-27 06:44:30 -07:00
David Mudrák
455fc30367 Merge pull request #1 from nebgor/MDL-27440_chunkyfix 
MDL-27440 Backup - added database module 1.9 backup converter
 2011-05-27 06:34:38 -07:00
Ruslan Kabalin
e710658d89 MDL-27171 forum: refactor forum settings 
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
 2011-05-27 13:49:28 +01:00
Ruslan Kabalin
2f2137fca4 MDL-27171 messages: admin settings reordering 
This includes:
 * most email settings go from general admin setings to email plugin settings
 * digestmailtime goes to mod/forum/settings.php
 * supportname, supportemail and supportpage go to Support contact page
 * all jabber settings go from general admin setings to jabber plugin settings

AMOS BEGIN
 MOV [jabberhost,admin],[jabberhost,message_jabber]
 MOV [configjabberhost,admin],[configjabberhost,message_jabber]
 MOV [jabberserver,admin],[jabberserver,message_jabber]
 MOV [configjabberserver,admin],[configjabberserver,message_jabber]
 MOV [jabberusername,admin],[jabberusername,message_jabber]
 MOV [configjabberusername,admin],[configjabberusername,message_jabber]
 MOV [jabberpassword,admin],[jabberpassword,message_jabber]
 MOV [configjabberpassword,admin],[configjabberpassword,message_jabber]
 MOV [jabberport,admin],[jabberport,message_jabber]
 MOV [configjabberport,admin],[configjabberport,message_jabber]
 MOV [digestmailtime,admin],[digestmailtime,forum]
 MOV [configdigestmailtime,admin],[configdigestmailtime,forum]
 MOV [allowusermailcharset,admin],[allowusermailcharset,message_email]
 MOV [configallowusermailcharset,admin],[configallowusermailcharset,message_email]
 MOV [mailnewline,admin],[mailnewline,message_email]
 MOV [configmailnewline,admin],[configmailnewline,message_email]
 MOV [noreplyaddress,admin],[noreplyaddress,message_email]
 MOV [confignoreplyaddress,admin],[confignoreplyaddress,message_email]
 MOV [sitemailcharset,admin],[sitemailcharset,message_email]
 MOV [configsitemailcharset,admin],[configsitemailcharset,message_email]
 MOV [smtphosts,admin],[smtphosts,message_email]
 MOV [configsmtphosts,admin],[configsmtphosts,message_email]
 MOV [smtpmaxbulk,admin],[smtpmaxbulk,message_email]
 MOV [configsmtpmaxbulk,admin],[configsmtpmaxbulk,message_email]
 MOV [smtpuser,admin],[smtpuser,message_email]
 MOV [configsmtpuser,admin],[configsmtpuser,message_email]
 MOV [smtppass,admin],[smtppass,message_email]
AMOS END

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
 2011-05-27 13:49:28 +01:00
Tim Hunt
612106b3a4 MDL-20636 fix URL handling for previews to always use Moodle URL. 
Also, make the preview window big enough. #367
 2011-05-27 11:49:23 +01:00
Wale Olujide
dc0373c852 MDL-20636 Make more space for the qusetion name in the question bank view #580. 2011-05-27 10:31:37 +01:00
Tim Hunt
c014b989ba MDL-27649 Convert the calculated question types to use the new variants mechanism. 2011-05-26 21:53:47 +01:00
Tim Hunt
1da821bbde MDL-27649 support question variants as a first-class concept in the question engine. 2011-05-26 21:23:56 +01:00
David Mudrak
826d17f274 MDL-27444 The choice module backup converter now uses on-start and on-end handlers to write <options> wrapper 
This is mainly for the demonstration purposes, the previous form works
as well.
 2011-05-26 18:37:15 +02:00
David Mudrak
f6f7a7266c Merge branch 'master' into backup-convert 
Conflicts:
	backup/util/xml/parser/processors/simplified_parser_processor.class.php
	backup/util/xml/parser/simpletest/testparser.php
 2011-05-26 17:30:27 +02:00
Rossiani Wijaya
39a35cc589 MDL-27450 mod_survey: added conversion code to restore 1.9 backup to 2.1 site 2011-05-26 13:25:18 +08:00
Aparup Banerjee
4c9c90fbe2 MDL-27440 Backup - added database module 1.9 backup converter 2011-05-26 11:32:05 +08:00
Eloy Lafuente (stronk7)
c4cee99c7b MDL-27625 rating - fix one merging problem 2011-05-25 22:34:51 +02:00
Eloy Lafuente (stronk7)
f2e725930b MDL-27471 rating - whitespace cleanup 2011-05-25 16:54:51 +02:00
Eloy Lafuente (stronk7)
5b52ce19c5 Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle 
Conflicts:
	mod/forum/lib.php
 2011-05-25 16:37:43 +02:00