Commit graph

11724 commits

Author SHA1 Message Date
David Mudrak
4ece48dc36 MDL-22414 Fixed the order of course modules in the restored course
During the restore, the section's sequence field is ignored and the
order of modules is controlled by the order of the <contents> activity
elements. This patch makes sure that the modules are listed in that
section in the right order.

Also, the patch removes the obsolete stash sectionidslist which was
introduced when the method get_stash_itemids() had not existed yet.
2011-06-09 02:41:27 +02:00
Eloy Lafuente (stronk7)
c7dbcc9452 Merge branch 'MDL-27770' of git://github.com/timhunt/moodle 2011-06-09 01:41:24 +02:00
Eloy Lafuente (stronk7)
d92858291a Merge branch 'wip-MDL-27638-master' of git://github.com/samhemelryk/moodle 2011-06-09 01:20:54 +02:00
David Mudrak
30d5190a9b MDL-27452 Workshop 1.9 backups conversion support 2011-06-09 00:00:03 +02:00
Tim Hunt
810c5b9e5a MDL-27770 unnecessary upgrade step copied into quiz upgrade script. 2011-06-08 17:48:43 +01:00
Sam Hemelryk
0b8dea80dc Merge branch 'MDL-27747' of git://github.com/timhunt/moodle 2011-06-08 17:09:05 +08:00
Sam Hemelryk
9186cb7e98 Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171 2011-06-08 11:07:22 +08:00
Tim Hunt
47678d60f8 MDL-27747 quiz_statistics fix edit question icons. #737 2011-06-07 16:46:30 +01:00
Tim Hunt
0f1c59c552 MDL-27747 quiz locallib remove unnecessary try/catch. #475
delegated_transaction just does the right thing. Thanks to Justin Wyllie for spotting this.
2011-06-07 16:27:49 +01:00
Tim Hunt
adf7fe2148 MDL-27747 Missing information and errors on the quiz view page. #720 2011-06-07 16:05:17 +01:00
Tim Hunt
f57d75bdf8 MDL-27747 quiz review, time taken and overtime were formatted incorrectly #598 2011-06-07 15:33:31 +01:00
Tim Hunt
97cdc1de72 MDL-27747 quiz summary, add a CSS class to the table rows based on question state.
The standard themes do not use this for anything, but it makes it easier for themers to do cool stuff.
Also improve the API for getting the question state class.
2011-06-07 15:11:04 +01:00
Tim Hunt
c9272e87f9 MDL-27747 quiz End test... link was not working. #387
I don't know why this was ever changed from class to id. That was done in commit a1eb3a4466.
2011-06-07 14:29:11 +01:00
Sam Hemelryk
c464a23873 Merged branch 's9_MDL-26392_wiki_files_master' from git://github.com/dongsheng/moodle.git with fixes 2011-06-07 16:29:44 +08:00
Sam Hemelryk
e0f18a37c9 Merge branch 'MDL-27734-workshop-example-weight' of git://github.com/mudrd8mz/moodle 2011-06-07 16:24:17 +08:00
Sam Hemelryk
656bb6725b Merge branch 'MDL-27733-workshop-deadlines' of git://github.com/mudrd8mz/moodle 2011-06-07 16:23:34 +08:00
Sam Hemelryk
ac6668198b Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle 2011-06-07 16:13:52 +08:00
Sam Hemelryk
6e76848427 Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle 2011-06-07 16:01:49 +08:00
Tim Hunt
6e56da8347 MDL-20636 Fix quiz_statistics upgrade (Eloy review comment A3). 2011-06-06 17:22:49 +01:00
Eloy Lafuente (stronk7)
cc5937f4c0 MDL-20636 changes to report statistics DB layer 2011-06-06 17:16:41 +01:00
Eloy Lafuente (stronk7)
44c280c63e MDL-20636 changes to mod/quiz DB layer 2011-06-06 17:16:35 +01:00
Eloy Lafuente (stronk7)
5abfa6a930 MDL-20636 changes to quiz and quiz reports upgrade code 2011-06-06 17:16:22 +01:00
Tim Hunt
54771d89d1 Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
Conflicts:
	lib/db/upgrade.php
	mod/quiz/lib.php
2011-06-06 17:14:59 +01:00
Eloy Lafuente (stronk7)
36e91f1de1 MDL-20636 Whitespace fixes 2011-06-06 16:38:46 +01:00
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