55863 Commits

Author SHA1 Message Date
Aparup Banerjee
a1a5d8968e Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle 2012-08-27 14:20:15 +08:00
Aparup Banerjee
d835cdb627 Merge branch 'MDL-34996_master' of git://github.com/grabs/moodle 2012-08-27 13:46:40 +08:00
Aparup Banerjee
13a20081d3 MDL-34429 fixed whitespace. 2012-08-27 12:07:15 +08:00
Aparup Banerjee
ed170bd86c Merge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle 2012-08-27 12:04:45 +08:00
Aparup Banerjee
7cc32281fc Merge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle 2012-08-27 11:30:44 +08:00
Aaron Barnes
1caeb4b450 MDL-32386 completion: Fix incorrect method parameters 2012-08-27 10:57:52 +12:00
Mary Evans
96a25065da MDL-35048 theme_formal_white: removed p {margin:0} from style/formal_white.css which was causing a regression in some areas of theme 2012-08-26 20:02:15 +01:00
Petr Škoda
6f6c9e5c6a MDL-35072 coding style cleanup in enrol_manual 2012-08-26 16:37:49 +02:00
Petr Škoda
005e57a225 MDL-35052 show all enrolled users in enrol UI included those enrolled via disabled plugins 2012-08-26 16:28:18 +02:00
Petr Škoda
d9669db9b3 MDL-35070 coding style cleanup in enrol_self 2012-08-26 16:02:38 +02:00
Petr Škoda
dd6b1f15cf MDL-23875 add option to limit self-enrol to cohort members only 2012-08-26 15:56:01 +02:00
Petr Škoda
882fb83519 MDL-35061 add more custom fields for enrol instances
This delays the splitting of plugin specific enrol info from shared enrol table.
2012-08-26 15:55:03 +02:00
Petr Škoda
84bc3773cc MDL-35064 add option to keep enrolments when uninstalling plugin 2012-08-26 12:17:11 +02:00
Tim Hunt
19de315e83 MDL-34306 gift question format: allow import of general feedback
This change introduces #### as a separator for general feedback. You need
to add ####General feedback goes here as the last thing inside the {...}.
For example

// question: 123  name: Shortanswer
::Shortanswer::Which is the best animal?{
    =Frog#Good!
    =%50%Cat#What is it with Moodlers and cats?
    =%0%*#Completely wrong
    ####Here is some general feedback!
}

Note that this change is not entirely backwards compatible. It will break
any existing GIFT file where the character sequence #### us used between the
{} as part of the question. This seems highly unlikely.
2012-08-25 14:27:40 +01:00
Petr Škoda
33c7a2d121 MDL-35060 remove unused session test file 2012-08-25 10:14:38 +02:00
Andreas Grabs
2c65cd8462 MDL-34996 - Improve help text for Feedback dependancies 2012-08-24 23:08:55 +02:00
Andreas Grabs
9b90584f43 MDL-34952 - change get_info() to public access 2012-08-24 21:56:45 +02:00
Tim Hunt
aa9d6e4300 MDL-32464 qformat multianswer: fix missing include.
Also, add a sample file that can be used for testing, and add a unit
test to verify this is working.
2012-08-24 16:56:18 +01:00
Andrew Robert Nicols
fd0680ff4a MDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call 2012-08-24 15:43:38 +01:00
Tim Hunt
aa5f05110f MDL-35055 question import: slight error with the Match grades option.
Even in the 'Error if grade not listed case', it was applying a small
tolerance. In the case of a fuzzy match, it was returning the inexact
grade from the import file, rather than the precise grade that Moodle
was expecting.

That causes problems when the editing form is displayed, because the
value from the database does not match any of the available options, so
the grade is changed to 0%.
2012-08-24 15:34:20 +01:00
sam marshall
1d1917aeaa MDL-31973 Groups: groups_members table should have 'component', 'itemid' fields 2012-08-24 15:30:13 +01:00
Petr Škoda
b3aefe3cc8 MDL-34990 improve custom toolbar setting parsing
It is probably better to parse the setting every time because somebody may put unsupported values directly into config.php, performance should not be an issue because we do not have editors on every page.
2012-08-24 16:11:00 +02:00
Petr Škoda
0bc9b897f9 MDL-34879 add upgrade.txt notes to editor_tinymce 2012-08-24 16:11:00 +02:00
Petr Škoda
883ecce0e9 MDL-34955 fix missing string 2012-08-24 16:11:00 +02:00
Petr Škoda
0b7858221c MDL-34955 add full TinyMCE subplugin management 2012-08-24 16:11:00 +02:00
Petr Škoda
caaccae5da MDL-34878 add custom TinyMCE toolbar setting 2012-08-24 16:10:59 +02:00
Petr Škoda
116ad39b7a MDL-34877 add tinymce subplugin setting support
Includes migration of spell related settings to spellchecker plugin.
2012-08-24 16:10:59 +02:00
Jean-Michel Vedrine
7ace84e069 MDL-25492 Blackboard V6+ question import is broken. 2012-08-24 13:27:45 +02:00
Ankit Agarwal
a8dfc4837e MDL-31633 grades: Fixing incorrect redirect when trying to edit grade letters from admin settings 2012-08-24 14:57:41 +08:00
Raymond Wijaya
694b11ab4a MDL-35004: Fix 'can not create a new instance of the assignment module with no completion setting' 2012-08-24 14:45:01 +08:00
Raymond Wijaya
77b3e35105 MDL-34907: Add a missing string that triggers Javascript error in assignment upgrade tool 2012-08-24 13:30:55 +08:00
Marina Glancy
42b1867410 MDL-34310 display grading method description inside render_preview
This way we can use the function gradingform_controller::render_preview() to display a preview for students in different modules
without worrying on gradingform-specific options on whether to display description for students or not
2012-08-24 11:51:20 +08:00
Ankit Agarwal
5fbe2118bc MDL-34549 libraries: Changing strictness of context::instance_by_id() when required 2012-08-24 11:30:35 +08:00
Ankit Agarwal
d197ea4300 MDL-34549 libraries: Replace get_context_instance_by_id() by context::instance_by_id() 2012-08-24 11:30:10 +08:00
Aaron Barnes
055cc8353d MDL-35042 blocks: Allow HTML block advanced setting to be toggled 2012-08-24 14:11:33 +12:00
David Monllao
67d4424a6b MDL-29598 backup Avoid possible future duplicate grade letters
More info in restore_activity_grades_structure_step->process_grade_letter() comments
2012-08-24 08:54:49 +08:00
Justin Filip
5bc8335c6f MDL-29598 backup Check whether a grade_letters record exists before trying to insert a new record 2012-08-24 08:54:49 +08:00
Andrew Davis
c6841df4df MDL-34406 message: removed an unnecessary string creation 2012-08-24 08:05:50 +08:00
Tim Hunt
ca9385682f MDL-34430 qtype essay: upgrade from MDL-31393 needs a progress bar. 2012-08-23 20:08:30 +01:00
Tim Hunt
f8d354282c MDL-35038 quiz reports: clarify the API changes docs.
Also re-organise the file to put the most recent changes at the top.
2012-08-23 19:29:14 +01:00
M Kassaei
940f7b9171 MDL-35038 quiz reports: document the API changes in 2.3. 2012-08-23 19:29:13 +01:00
Tim Hunt
e7a6779efb MDL-35026 qtype multianswer: misnamed string.
AMOS BEGIN
 MOV [questionnadded,qtype_multianswer],[questionsadded,qtype_multianswer]
AMOS END
2012-08-23 19:28:53 +01:00
Tim Hunt
2b3f70dbad MDL-35023 qtype calculated: fix strict syntax problem. 2012-08-23 19:28:38 +01:00
Tim Hunt
9c2e178e2f MDL-35003 questions: remove stray full stop after correct answer.
In a few situations, this full stop makes things a bit more grammatical,
but there are many other situations where it causes problems. So, on
balance we will remove it.
2012-08-23 19:28:20 +01:00
Tim Hunt
d2acbd1ad4 MDL-34993 questions: convert numeric fields to float on load.
NUMBER(X,Y) typically come back from the DB as strings. If you don't
convert them to float, then when you display them, it appears as
1.0000000, which is not normally what you want.

Also, increase the size of the field on the edit form, so if you
question does have default mark 0.1234567, you can see that!
2012-08-23 19:28:05 +01:00
Tim Hunt
93266d0fe0 MDL-31837 numerical tolerance: better handling of very small tolerances.
The changes between Moodle 1.9 and 2.1 made the marking of very small
answers like 10^-20 almost impossible. This change fixes it.

This fix is almost entirely due the the careful research of Pierre
Pichet, who carefully testing various proposals, and worked out that
this one seemed best.
2012-08-23 19:15:15 +01:00
Eloy Lafuente (stronk7)
d71c486507 weekly release 2.4dev 2012-08-23 19:26:37 +02:00
Eloy Lafuente (stronk7)
920d5b8d1a Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-08-23 19:18:22 +02:00
Eloy Lafuente (stronk7)
7f4de36ddb MDL-31957 Course reset: Add missing global 2012-08-23 02:04:13 +02:00
Eloy Lafuente (stronk7)
0a31b2f308 Merge branch 'MDL-34738_fixup' of git://github.com/jmvedrine/moodle 2012-08-22 16:36:53 +02:00