Eloy Lafuente (stronk7)
be13d37a02
Merge branch 'MDL-28074' of git://github.com/timhunt/moodle
2011-06-29 23:09:13 +02: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
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
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
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
Rajesh Taneja
912ea4bc84
MDL-27964 lesson - Quick fix added for importing question files in lesson module
2011-06-29 13:52:52 +08:00
Andrew Davis (andyjdavis)
26a0af08e0
MDL-28072 coursereport: added a missing require_once()
2011-06-29 12:59:44 +08:00
Andrew Davis (andyjdavis)
5daa7279d4
MDL-28087 assignment: made the jabber notification of assignment grading better
2011-06-29 11:29:11 +08:00
Dongsheng Cai
4de00da791
MDL-27936, send_message webservice should respect contact settings, improve readability, rename it to moodle_message_send_instantmessages
2011-06-29 11:26:16 +08:00
Eloy Lafuente (stronk7)
cddb428722
Merge branch 'MDL-27990_assignment_notifications' of git://github.com/andyjdavis/moodle
2011-06-28 22:14:54 +02:00
Andrew Davis (andyjdavis)
d863aecb92
MDL-27812 blocks: fixed the ability to add a block and have it display on all pages
2011-06-28 18:50:03 +08:00
Sam Hemelryk
5163ac94b0
Merge branch 'MDL-28023_assignment_jabber' of git://github.com/andyjdavis/moodle
2011-06-28 17:04:55 +08:00
Rajesh Taneja
b89bf55f84
MDL-27964 lesson - Old file picker is replaced with new filepicker, currently all imported questions will be saved in /temp/questionimport/ where questionbank files are saved.
2011-06-28 12:10:56 +08:00
Andrew Davis (andyjdavis)
83dfca3fa3
MDL-27990 assignment: removed a redundant retrieval of a user preference
2011-06-28 11:08:59 +08:00
Sam Hemelryk
e2542e1faf
Merge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle
2011-06-28 10:16:57 +08:00
Rossiani Wijaya
57a4bd032b
MDL-27955 lesson module: fixed error for reviewing lesson and update string to continue or finish reviewing
2011-06-28 10:14:55 +08:00
Sam Hemelryk
256383c07d
Merge branch 'MDL-28014_head' of git://github.com/grabs/moodle
2011-06-28 10:12:39 +08:00
Tim Hunt
50de6ad083
MDL-28037 Make restoring quiz_attempts more robust.
...
Don't assume that 0 is unique (even temporarily).
2011-06-27 18:27:12 +01:00
Tim Hunt
f997f0fc46
MDL-28028 prevent orphaned question_attempt data from breaking upgrade.
2011-06-27 17:27:40 +01:00
Tim Hunt
0366ef262a
MDL-28035 problems with upgrade/restore of ataptive quizzes from 2.0
...
There were two main problems:
1. The unit tests for upgrading adaptive quiz attempts had slighly the
wrong $expectedqa, and so matching that the upgrade was doing the wrong
thing in certain situations. The main issue was that it was setting
-_try = 1 on the first step, which broke the penalty calculation when
the quiz was regraded. There were also some other subtleties with
incrementing -_try that were not right before.
2. It was possible in 2.0 and earlier for two question_states to get the
same seq_number, and restoring 2.0 backups was rashly assuming that that
was unique.
2011-06-27 17:10:02 +01:00
Eloy Lafuente (stronk7)
7fde489dae
on-demand release 2.1beta
2011-06-27 17:32:54 +02:00
Eloy Lafuente (stronk7)
34ff02bff0
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-06-27 17:31:42 +02:00
Eloy Lafuente (stronk7)
32038aaccc
Merge branch 'MDL-28033' of git://github.com/timhunt/moodle
2011-06-27 17:12:40 +02:00
Eloy Lafuente (stronk7)
3bdc10150c
Merge branch 'MDL-28049' of git://github.com/timhunt/moodle
2011-06-27 15:56:03 +02:00
sam marshall
a854bca3cf
MDL-28021 Completion system can create inconsistent database rows
...
This change includes:
(1) update deletes older versions of inconsistent rows
(2) update drops one index and replaces it with a new unique index
(3) fixed to ensure that when it decides whether to insert or update
it uses current database state and not cached info
(4) unit tests updated to test #3
Conflicts:
lib/db/upgrade.php
version.php
2011-06-27 15:25:13 +02:00
Tim Hunt
19f7bb5b7e
MDL-28049 conditional include so xml question format can work for both lesson and 3rd party qtypes.
...
This is a regression caused by MDL-27956.
2011-06-27 13:59:57 +01:00
Tim Hunt
2779cc7d89
MDL-28033 Fatal error upgrading form 1.9 to 2.1 due to missing include.
2011-06-27 13:43:16 +01:00
Eloy Lafuente (stronk7)
8e0733f4d8
Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle
2011-06-27 14:06:13 +02:00
Eloy Lafuente (stronk7)
f4fd96a848
MDL-28032 database - finally question->defaultmark goes signed. Changing prev commit.
2011-06-27 11:37:34 +02:00
Eloy Lafuente (stronk7)
f83776f2ec
Merge branch 'wip-MDL-27809-master-r7' of git://github.com/samhemelryk/moodle
2011-06-27 10:11:02 +02:00
Sam Hemelryk
29e2d0a820
Merge branch 'MDL-26199' of git://github.com/timhunt/moodle
2011-06-27 16:03:48 +08:00
Sam Hemelryk
35d4d85dc4
Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle
2011-06-27 15:45:41 +08:00
Sam Hemelryk
a3f8860d6c
Merge branch 'quizreport_langstrings' of git://github.com/stronk7/moodle
2011-06-27 15:30:11 +08:00
Sam Hemelryk
da17baf76a
Merge branch 'backup_bump' of git://github.com/stronk7/moodle
2011-06-27 15:28:49 +08:00
Mark Johnson
c78f8443e6
MDL-28025 pagelib improve error message when $PAGE->context isn't set
2011-06-27 08:22:43 +01:00
Sam Hemelryk
3992a46e89
MDL-27809 navigation: Fixed up a couple of minor issues after peer-review
2011-06-27 15:11:28 +08:00
Andrew Davis (andyjdavis)
b38e2e28a1
MDL-27829 blocks: altered the algorithm used to find plugin page types
2011-06-27 12:27:41 +08:00
