Sam Hemelryk
4c9e9e09ea
Merge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle
2011-07-01 15:07:21 +08:00
Eloy Lafuente (stronk7)
a80d6ab536
Merge branch 'MDL-28128' of git://github.com/timhunt/moodle
2011-07-01 01:49:59 +02:00
Eloy Lafuente (stronk7)
70debd7391
Merge branch 'MDL-28129' of git://github.com/timhunt/moodle
2011-07-01 01:41:38 +02:00
Eloy Lafuente (stronk7)
4411596c27
Merge branch 'MDL-28132' of git://github.com/timhunt/moodle
2011-07-01 01:37:43 +02:00
Eloy Lafuente (stronk7)
d72129829f
Merge branch 'MDL-28133' of git://github.com/timhunt/moodle
2011-07-01 01:10:06 +02:00
Eloy Lafuente (stronk7)
f9d2eb4f20
Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle
2011-07-01 00:54:35 +02:00
Eloy Lafuente (stronk7)
7ace3a2199
Merge branch 'MDL-28006-convert-gradebook' of git://github.com/mudrd8mz/moodle
2011-07-01 00:09:50 +02:00
Eloy Lafuente (stronk7)
b1273d09dd
Merge branch 'MDL-28116-master' of git://github.com/sammarshallou/moodle
2011-06-30 23:56:53 +02:00
David Mudrak
d46badb176
MDL-28006 restore - improved handling of gradebook 1.9 backups
...
On contrary from a backup created in 2.0, the file gradebook.xml in the
converted MBZ can contain the course grade_item without the
corresponding grade_category record which is something restore_stepslib
did not expect. This patch fixes two places:
1) the gradebook restore does not use mapped itemid but calls
grade_category::fetch_course_category() to get the actual category to
link the course_item with
2) after_execute makes sure that the mapping actually exists before
trying to move the activities from the default root category
2011-06-30 22:40:54 +02:00
Tim Hunt
baf706b503
MDL-28132 truncate very long category names before using them in random question names.
2011-06-30 19:35:35 +01:00
Jamie Pratt
1e257a3a54
NOBUG if we are going to reuse the functions used within the evalmath code then
...
the calling api should not be weird with reversed parameters etc.
2011-06-30 17:50:05 +01:00
Jamie Pratt
9085134ed7
MDL-27659 "have evalmath accept numbers expressed with scientific
...
notation"
2011-06-30 17:49:49 +01:00
Jamie Pratt
4733133533
NOBUG fixed some coding style deviations in unit test code. Mostly
...
white space changes and added scope declarations to unit test
functions.
2011-06-30 17:49:31 +01:00
jamiepratt
e2beee5880
NOBUG move pattern for func and var names into a static var and make a function to test a string to see if it is a valid func or var name.
2011-06-30 17:49:01 +01:00
sam marshall
c02b60bccc
MDL-28116 Fix issue restoring old backups with duplicate completion rows
2011-06-30 17:33:12 +01:00
Jamie Pratt
e5060e2209
MDL-28129 two issues with loading and saving questions
...
1. Missing order by could randomise the order of the hints.
2. the extraanswerfields big had some SQL errros.
2011-06-30 17:21:37 +01:00
Eloy Lafuente (stronk7)
0bd8f4c665
Merge branch 'MDL-28115' of git://github.com/rwijaya/moodle
2011-06-30 17:09:42 +02:00
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
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
