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

10707 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b9412668c4 Merge branch 'MDL-27902' of git://github.com/timhunt/moodle 2011-06-20 01:21:18 +02:00
Tim Hunt
3a5da40b4c MDL-27902 quiz reviewquestion.php page needs to be converted to use the renderer. 2011-06-17 15:27:41 +01:00
Tim Hunt
08c458d10f MDL-27877 question engine progress bars not working. 2011-06-16 18:55:10 +01:00
Aparup Banerjee
da4772a276 Backup - mod lesson conversion: apply jumpto fix only to matching question types. 2011-06-16 10:52:55 +02:00
Aparup Banerjee
914bfea245 MDL-27819 Backup - fixed extra answers/jump data. 
- fixed unset causing missing property
	- fixed answers empty notice, allowed for page with no answers.
 2011-06-16 10:52:45 +02:00
Aparup Banerjee
6df63e4f9b MDL-27819 Backup - mod_lesson conversion: optimized page buffering from all pages to 3 pages 2011-06-15 12:09:33 +02:00
Aparup Banerjee
496a576aa9 MDL-27819 backup - added nextpageid and prevpageid elements to lesson moodle1 backup conversion to 2.x 2011-06-15 12:09:24 +02:00
Eloy Lafuente (stronk7)
84a5f2d26e Merge branch 'MDL-27820' of git://github.com/stronk7/moodle 2011-06-15 11:59:52 +02:00
Eloy Lafuente (stronk7)
5edac71d16 MDL-27820 backup - fix backup of ratings 2011-06-15 11:01:41 +02:00
Eloy Lafuente (stronk7)
a16e137f21 Merge branch 'MDL-27639_wip' of git://github.com/timhunt/moodle 2011-06-15 01:30:59 +02:00
Eloy Lafuente (stronk7)
5800c0fde1 Merge branch 'master_MDL-27858' of git://github.com/danmarsden/moodle 2011-06-15 01:18:05 +02:00
Dan Marsden
bdea587be2 SCORM MDL-27858 - fix typo 2011-06-15 10:31:52 +12:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Tim Hunt
18ab06bac5 MDL-27639 restore of attempt data from 2.0 - first attempt. 
This is now at the stage where it mostly appears to work, at lease on
one backup file.
 2011-06-14 12:11:19 +01:00
Eloy Lafuente (stronk7)
e298ec5162 Merge branch 'MDL-27525' of git://github.com/rwijaya/moodle 2011-06-14 12:11:54 +02:00
Eloy Lafuente (stronk7)
a0be4a1fcb Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle 2011-06-13 19:52:49 +02:00
Eloy Lafuente (stronk7)
269c173e81 whitespace fixes 2011-06-13 12:21:48 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Aparup Banerjee
486e889262 MDL-27446 Backup - added answers 'jumpto' conversion to moodle1 converter for 
lesson
 2011-06-13 10:02:28 +02:00
Sam Hemelryk
12aafa8769 Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle 2011-06-13 15:49:24 +08:00
Sam Hemelryk
f44c912bd0 Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle 2011-06-13 15:32:44 +08:00
Sam Hemelryk
aa8ec18b52 Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle 2011-06-13 14:53:37 +08:00
Sam Hemelryk
a7b7c2d3db Merge branch 'MDL-20538' of git://github.com/timhunt/moodle 2011-06-13 11:22:51 +08:00
Rossiani Wijaya
6ff768a67f MDL-27525 mod_wiki: Fixed typing error for the variable and assign the value contextid to use mod context id 2011-06-13 10:54:07 +08:00
Dan Marsden
d1e3b5c2d3 MDL-27404 SCORM fix for IE 6 - thanks to Howard Miller 2011-06-13 11:32:26 +12:00
Dan Marsden
2875714e4a MDL-27522 SCORM tidy up commit 2011-06-13 11:00:43 +12:00
Ankit Kumar Agarwal
b4baa7faa3 MDL-27522 SCORM - seperate user report from main report page to allow better re-use in preparation for MDL-27256 2011-06-13 10:21:40 +12:00
David Mudrak
9ddff589df MDL-26147 workshop - added capability to ignore time restrictions 2011-06-10 19:01:27 +02:00
David Mudrak
a74cadfa77 MDL-27065 workshop grades categories can be defined in mod_form 
Because the Workshop module creates two grade items in the gradebook, we
can't use standard modedit features to set the corresponding category in
the gradebook (it supports single grade item only).

The patch also cleans the mod_form.php so that it does not use the
global $COURSE (just because I do not like this global variable).

And for the record - QuickForms must die.
 2011-06-10 16:48:09 +02:00
Marina Glancy
13b3f4d4af MDL-26430 fixed appearance of one html form within another 2011-06-10 12:55:12 +08:00
Tim Hunt
55190d7e2c MDL-20538 get rid of badly name-spaced constants from lib/questionlib.php. 
Unfortunately, they are used all over the import/export code, so I cannot eliminate them completely. However, I was able to move them out of the core library.
 2011-06-09 19:27:36 +01:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert 
Conflicts:
	theme/base/style/core.css
 2011-06-09 13:04:49 +02:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly 
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
 2011-06-09 13:51:14 +08:00
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 a1eb3a4466cd.
 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