Eloy Lafuente (stronk7)
555ac02985
Merge branch 'MDL-26618' of git://github.com/timhunt/moodle
2011-07-05 17:46:46 +02:00
Sam Hemelryk
ee992c6c66
Merge branch 'MDL-25357_wip' of git://github.com/timhunt/moodle
2011-07-05 16:51:49 +08:00
Iñaki Arenaza
971db6a110
MDL-24666 sync_users.php can throw db exception on sites upgraded from 1.x
...
From 2.0 on we lowercase all the settings related to LDAP attributes
to cope with differences in LDAP servers when returning attribute
names as array indices (some lowercase them, some leave them as
specified in the query, some normalize them, etc.).
But we only lowercase them when saving the settings page. So on sites
that have been migrated from 1.x, it may happen that we still have
mixed-case attribute names. And this is fatal for the user_attribute
setting, as we might not detect it in the returned array from LDAP and
it will be empty (and the db layer throws and exception).
So we just make sure the attribute name is lowercased (and trimmed,
in case it's got some white space around it).
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2011-07-04 21:47:43 +02:00
Tim Hunt
fd3932fe54
MDL-26618 Moving sticky blocks on other pages does not work in Oracle.
...
This was due to some missing $DB->sql_empty() in a query affecting the
block_positions table.
2011-07-04 15:36:16 +01:00
Tim Hunt
c141b05f7d
MDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 sections at an choice.
...
Also fix one bad <br/> in another lang string.
2011-07-04 15:35:03 +01:00
Eloy Lafuente (stronk7)
81f8e0f8a0
weekly release 2.2dev
2011-07-01 23:58:02 +02:00
Eloy Lafuente (stronk7)
d64baeceb2
release 2.1
2011-07-01 23:47:23 +02:00
Eloy Lafuente (stronk7)
f4f835b739
fix permissions
2011-07-01 23:39:00 +02:00
Eloy Lafuente (stronk7)
c5b0344b62
Merge branch 'MDL-28152-course-grade-category' of git://github.com/mudrd8mz/moodle
2011-07-01 22:33:04 +02:00
Eloy Lafuente (stronk7)
0e2901443c
Merge branch 'MDL-28103' of git://github.com/timhunt/moodle
2011-07-01 22:17:16 +02:00
Tim Hunt
aa5257ce7e
MDL-28103 one more problem.
2011-07-01 21:17:06 +01:00
David Mudrak
41f21f92cf
MDL-28152 Improved detection of the course grade_category on course restore
2011-07-01 22:12:30 +02:00
Tim Hunt
1645ad22d8
MDL-28103 code to deal with missing question_attempts was buggy.
2011-07-01 21:07:49 +01:00
Tim Hunt
e7933796a8
MDL-28103 make the upgrade more robust in the presence of old garbage data in the DB.
2011-07-01 20:54:42 +01:00
Eloy Lafuente (stronk7)
715a5bb732
MDL-27829 blocks - lang string fixes. Credit goes to Helen!
2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
3e16a2ca66
MDL-27829 blocks - clean dupe comments
2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
ddaa914789
MDL-27829 block creation - ensure correct pagetypepattern in mod/ pages
2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
e5a863e55c
MDL-27829 course report - fix name of "Course completion report". Credit goes to Helen!
2011-07-01 20:38:06 +02:00
Tim Hunt
dfcbecd487
MDL-28103 when handling questions that have been deleted from the question bank, find the right updater class.
2011-07-01 17:13:47 +01:00
Tim Hunt
4a6ac0ceb1
MDL-28103 fix silly error in quiz_upgrade_very_old_question_sessions.
2011-07-01 17:13:45 +01:00
Eloy Lafuente (stronk7)
ec48e283b0
Merge branch 'MDL-27960' of git://github.com/nebgor/moodle
2011-07-01 16:13:51 +02:00
Eloy Lafuente (stronk7)
264d81eee3
Merge branch 's11_MDL-27976_undefined_variable_master' of github.com:dongsheng/moodle
2011-07-01 13:43:05 +02:00
Aparup Banerjee
b74b347aba
MDL-27960 assignment subplugin moodle1 conversion handling and handlers added
2011-07-01 19:11:29 +08:00
Eloy Lafuente (stronk7)
67fcc9989a
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
2011-07-01 11:51:26 +02:00
Andrew Davis (andyjdavis)
2f9bdadfd2
MDL-27829 blocks: made the ability to add a block to all site administration pages work
2011-07-01 17:11:10 +08:00
Eloy Lafuente (stronk7)
3bd43d3d5c
Merge branch 'MDL-27418' of git://github.com/timhunt/moodle
2011-07-01 11:05:17 +02:00
Sam Hemelryk
90e9d09b5f
Merge branch 'MDL-28138' of git://github.com/timhunt/moodle
2011-07-01 17:01:57 +08:00
Tim Hunt
e42646b167
MDL-27418 fix minor regression found by Rajesh.
2011-07-01 09:44:31 +01:00
Eloy Lafuente (stronk7)
49752ecb59
Merge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle
2011-07-01 10:40:15 +02:00
Tim Hunt
01533e9cce
MDL-28138 fix calculated-specific format float function
...
Sadly this has to be done in question.php and in two places in the ugprade code :-(.
2011-07-01 09:14:56 +01:00
Andrew Davis (andyjdavis)
346a32a75b
MDL-27829 blocks: added some more page types to some _page_type_list() functions
2011-07-01 15:43:26 +08:00
Sam Hemelryk
4c9e9e09ea
Merge branch 's11_MDL-28121_split_master' of github.com:dongsheng/moodle
2011-07-01 15:07:21 +08:00
Andrew Davis (andyjdavis)
1fe0ecabf1
MDL-27829 blocks: altered some strings so page type strings match the names of the course reports in the UI
2011-07-01 10:01:38 +08:00
David Mudrak
c9b3efd20c
MDL-28022 glossary entry without attachment can be exported to Mahara as Leap2A content
...
The problem here was that the manifest file was written into the
'./files/leap2a.xml' instead of the './leap2a.xml' in the ZIP package.
I believe there was a bug in the write_new_file() using the 3rd parameter
incorrectly. A detailed review of all other modules using the same
method must happen soon.
2011-07-01 02:34:00 +02: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
