Tim Hunt
ceb4d2ed0b
MDL-28128 finish the fix for MDL-28035.
...
There was one place where I had only fixed the backup code to work-around bad data from Moodle 2.0. I needed to make the equivalent change in the upgrade code.
The bad data is that the seq_number fields can be wrong (not unique). Se already have data ordered by (seq_number, id) and the array keys of the array we are building are not used for anything, so this fix deals with the problem.
2011-06-30 16:00:15 +01:00
Eloy Lafuente (stronk7)
91dc377b74
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
2011-06-30 16:39:45 +02:00
Eloy Lafuente (stronk7)
db0fe3b295
Merge branch 'MDL-28061' of git://github.com/rwijaya/moodle
2011-06-30 16:22:20 +02:00
Tim Hunt
69384c1939
MDL-28127 incorrect lang string placeholder in question engine upgrade.
2011-06-30 15:20:42 +01:00
David Mudrak
3343677e0a
MDL-28006 Fixed grades subpath handling
...
Registering the grades subpath even if we do not process the grades yet.
This is to prevent from incorrect considering the wrapper as an empty tag.
2011-06-30 15:17:03 +02:00
Rossiani Wijaya
0c8d3939bc
MDL-28061 mediaplugins filter: add aac audio node to filetypes.mm, fixed string mistype within the admin setting page (acc -> aac) and add mediaplugin_html5audio css class to align the player/link like the rest.
2011-06-30 19:29:07 +08:00
Rossiani Wijaya
54fd7cd9ee
MDL-28115 lesson module: fixed undefined variable for multiple answer, disabled numberical input text during review and fixed bug for essay answer during review process.
2011-06-30 18:43:25 +08:00
Dongsheng Cai
1e539f647d
MDL-27976, Fixed undefined variable
2011-06-30 17:46:44 +08:00
Andrew Davis (andyjdavis)
d097ad564d
MDL-27829 blocks: added a warning to the block settings page that displays when the block was using a block type we dont let users select anymore
2011-06-30 17:44:50 +08:00
Dongsheng Cai
8819c47b64
MDL-28121, fixed deprecated split() function
2011-06-30 17:34:36 +08:00
Andrew Davis (andyjdavis)
096928c79e
MDL-27829 blocks: improved backwards compatibility for blocks set to display on page types we dont allow the user to select anymore
2011-06-30 16:42:28 +08:00
Jamie Pratt
5b5206e1cb
MDL-28099 Fixed regression as outlined in tracker.
2011-06-30 14:34:10 +07:00
Andrew Davis (andyjdavis)
800688bd1e
MDL-27829 blocks: added code to make the page type restrictions for blocks on admin setting pages make sense
2011-06-30 15:32:34 +08:00
Sam Hemelryk
54ae8ed032
Merge branch 'MDL-24684_master' of git://github.com/stronk7/moodle
2011-06-30 10:49:29 +08:00
Eloy Lafuente (stronk7)
b7a45fa782
MDL-24684 backup - basic protection against time/memory limits
2011-06-30 03:37:30 +02:00
Eloy Lafuente (stronk7)
4ea6ce7e39
Merge branch 'MDL-28044' of git://github.com/nebgor/moodle
2011-06-30 01:59:49 +02:00
Eloy Lafuente (stronk7)
9829fa8261
Merge branch 'MDL-15587-head' of git://github.com/grabs/moodle
2011-06-30 01:54:19 +02:00
Eloy Lafuente (stronk7)
06a7f952cb
Merge branch 'MDL-19864_database_excel_export' of git://github.com/andyjdavis/moodle
2011-06-30 01:16:57 +02:00
Eloy Lafuente (stronk7)
0bde123fa8
Merge branch 'wip-MDL-27431-master' of git://github.com/Beedell/moodle
2011-06-30 01:13:34 +02:00
Eloy Lafuente (stronk7)
ca2b89d5df
Merge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle
2011-06-30 01:10:51 +02:00
Eloy Lafuente (stronk7)
a092e9bc42
Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle
2011-06-30 00:55:20 +02:00
Eloy Lafuente (stronk7)
586fecb80b
Merge branch 'MDL-27149' of git://github.com/timhunt/moodle
2011-06-30 00:20:43 +02:00
Eloy Lafuente (stronk7)
497ad94adb
Merge branch 'MDL-28055' of git://github.com/timhunt/moodle
2011-06-30 00:02:51 +02:00
Eloy Lafuente (stronk7)
f684dce013
Merge branch 'MDL-28108' of git://github.com/timhunt/moodle
2011-06-30 00:00:12 +02:00
Eloy Lafuente (stronk7)
6e344148c1
MDL-27418 qtype numerical - minor whitespace fix
2011-06-29 23:57:08 +02:00
Eloy Lafuente (stronk7)
88933f08cb
Merge branch 'MDL-27418' of git://github.com/timhunt/moodle
2011-06-29 23:51:33 +02:00
Eloy Lafuente (stronk7)
0f744d2ca4
Merge branch 'MDL-27430' of git://github.com/timhunt/moodle
2011-06-29 23:33:01 +02:00
Eloy Lafuente (stronk7)
be13d37a02
Merge branch 'MDL-28074' of git://github.com/timhunt/moodle
2011-06-29 23:09:13 +02:00
Tim Hunt
05a5c2f9a2
MDL-28108 oops! I got the cut-off percentage wrong.
2011-06-29 22:02:59 +01:00
Tim Hunt
56a4ae4673
MDL-28074 question preview should set context/course/cm properly.
...
1. We need this so that, for example, when previewing a question from
the quiz editing page, the preview uses the filter settings, theme and
language set for that quiz and course.
2011-06-29 21:25:56 +01:00
Eloy Lafuente (stronk7)
f4eeee5bd5
Merge branch 'pagelib_single' of git://github.com/marxjohnson/moodle
2011-06-29 21:00:06 +02:00
Eloy Lafuente (stronk7)
76feb947b6
Merge branch 'MDL-28028' of git://github.com/timhunt/moodle
2011-06-29 20:58:27 +02:00
Eloy Lafuente (stronk7)
f0548d18bf
Merge branch 'MDL-28035' of git://github.com/timhunt/moodle
2011-06-29 20:47:16 +02:00
Eloy Lafuente (stronk7)
fae9cd077c
Merge branch 'MDL-28037' of git://github.com/timhunt/moodle
2011-06-29 20:44:49 +02:00
Eloy Lafuente (stronk7)
282a0a713e
Merge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle
2011-06-29 20:11:17 +02:00
Eloy Lafuente (stronk7)
1333c05ebe
Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle
...
Conflicts:
lib/db/services.php
version.php
2011-06-29 20:00:49 +02:00
Eloy Lafuente (stronk7)
3a4c390c53
Merge branch 's11_MDL-27976_get_users_by_courseid_master' of github.com:dongsheng/moodle
2011-06-29 19:50:39 +02:00
Eloy Lafuente (stronk7)
9cdff2b2a5
Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle
2011-06-29 18:12:18 +02:00
Tim Hunt
3a6eb8efdf
MDL-27418 qtype numerical correct grading of 'right value, wrong unit' reponses.
...
Probably easiest to explain by example: If the right answer is 1.23 m with alternate
unit 100 cm = 1m then the completely right answers are 1.23 m and 123 cm.
Right answer, wrong unit responses include 1.23, 1.23 frogs and 1.23 cm.
123 m is not considered to have the correct numerical value.
We may well re-consider the way this works in a future version of Moodle.
Unit grading was not implemented before Moodle 2.0. In Moodle 2.0, the unit grading
was more permissive than here, for example 123 m would have been graded correctly in
2.0. However, I'm not sure I follow the rationale for that.
2011-06-29 15:41:56 +01:00
Eloy Lafuente (stronk7)
ae5b0cde4d
Merge branch 'MDL-27955_HEAD' of git://github.com/rwijaya/moodle
2011-06-29 15:42:26 +02:00
Eloy Lafuente (stronk7)
0822174adc
Merge branch 'MDL-27812_front_page_blocks' of git://github.com/andyjdavis/moodle
2011-06-29 15:29:14 +02:00
Eloy Lafuente (stronk7)
b28c4c22f3
Merge branch 'wip-mdl-27964-master' of git://github.com/rajeshtaneja/moodle
2011-06-29 15:07:07 +02:00
Eloy Lafuente (stronk7)
c5401e743d
Merge branch 'MDL-28072_coursereport_undefined_function' of git://github.com/andyjdavis/moodle
2011-06-29 15:01:50 +02:00
Jamie Pratt
b1eca34453
MDL-28099 fixes issue with filepicker and element names with index not passing
...
value for draftitemid.
2011-06-29 18:39:15 +07:00
Rossiani Wijaya
abd5c24e28
MDL-27955 lesson module: fixed error for reviewing lesson and update string to continue or finish reviewing
2011-06-29 18:18:52 +08:00
Sam Hemelryk
f86e19b1ee
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
2011-06-29 17:04:13 +08:00
Dan Marsden
444ff001a1
SCORM MDL-28016 - fix redirect call to use proper moodle_url
2011-06-29 20:31:19 +12:00
Dongsheng Cai
014792901d
MDL-27976 webservice moodle_user_get_users_by_courseid webservice
2011-06-29 15:41:31 +08:00
Sam Hemelryk
7bbf41661b
MDL-27988 backup grade: Calculated grade items calculation references now corrected and idnumber restore improved
2011-06-29 15:26:48 +08:00
Sam Hemelryk
364f43b0b4
MDL-25249 calendar: Fixed regression in set.php
2011-06-29 15:08:27 +08:00
