Commit graph

48567 commits

Author SHA1 Message Date
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
Tim Hunt
8818c826ea MDL-28055 quiz_upgrade_very_old_question_sessions bit does not work because of missing includes. 2011-06-28 10:57:50 +01: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
Andrew Davis (andyjdavis)
0f1751b01b MDL-28023_assignment_jabber assignment: added context url to improve the jabber notifications 2011-06-27 11:08:21 +08:00
AMOS bot
c31745211a Automatically generated installer lang files 2011-06-27 00:55:10 +00:00
Eloy Lafuente (stronk7)
a8e6c39e9f Merge branch 'MDL-28024' of git://github.com/timhunt/moodle 2011-06-27 01:44:40 +02:00
Eloy Lafuente (stronk7)
f1231efec4 MDL-28038 backup - bump 2011-06-26 19:15:06 +02:00
Eloy Lafuente (stronk7)
8b95f430b5 MDL-28036 quiz - add some missing (reports) lang strings 2011-06-26 18:22:23 +02:00
Eloy Lafuente (stronk7)
a0628c68de MDL-28032 database - fix some sign inconsistencies 2011-06-26 13:12:42 +02:00
Eloy Lafuente (stronk7)
d466e23c38 MDL-28032 database - retrofit signed info for decimal/float (improves diffs detection) 2011-06-26 12:54:16 +02:00
Andrew Davis (andyjdavis)
fa09b5a9a3 MDL-28023 assignment: assignment wasnt supplying all the data necessary to produce a meaningful jabber notification 2011-06-25 13:12:48 +08:00
Andreas Grabs
da457a944d MDL-15587 - Course Participation report for a feedback activity 2011-06-24 23:13:00 +02:00
Tim Hunt
5cc532e8e9 MDL-28024 adaptive qbehaviour. Displayed penalties not rounded correctly. 2011-06-24 14:26:49 +01:00
Rossiani Wijaya
560f549593 MDL-27922 lesson mod: fixed string for activity link 2011-06-24 16:50:31 +08:00
Sam Hemelryk
e26507b361 MDL-27809 navigation: Reworked the caching within navigation and improved the ordering of events in order to reduce the use of session without serious impact on serverload 2011-06-24 16:42:41 +08:00
Andrew Davis (andyjdavis)
be34802d23 MDL-27990 assignment: Some small modifications to the assignment notification code
AMOS BEGIN
 MOV [enableemailnotification,mod_assignment],[enablenotification,mod_assignment]
 MOV [enableemailnotification_help,mod_assignment],[enablenotification_help,mod_assignment]
AMOS END
2011-06-24 14:19:40 +08:00
Eloy Lafuente (stronk7)
50d32a2baf on-demand release 2.1beta 2011-06-24 00:48:51 +02:00
Eloy Lafuente (stronk7)
2e27e2d64a Merge branch 'MDL-28012' of git://github.com/timhunt/moodle 2011-06-24 00:31:53 +02:00
Eloy Lafuente (stronk7)
89ad7c078e Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle 2011-06-24 00:21:58 +02:00
Eloy Lafuente (stronk7)
4965f02087 Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle 2011-06-24 00:13:48 +02:00
Eloy Lafuente (stronk7)
06c8cef4c2 Merge branch 'wip-MDL-27962-master' of git://github.com/samhemelryk/moodle 2011-06-24 00:02:20 +02:00
Eloy Lafuente (stronk7)
fcb36b65ec Merge branch 'wip-MDL-27958-master' of git://github.com/samhemelryk/moodle 2011-06-23 23:57:55 +02:00
Eloy Lafuente (stronk7)
adecb9de9a Merge branch 'wip-MDL-27940-master' of git://github.com/samhemelryk/moodle 2011-06-23 23:54:32 +02:00
Andreas Grabs
b7030c3def MDL-28014 - unpropitious use of bcmod() 2011-06-23 21:22:38 +02:00
Andreas Grabs
65ee5d7dad MDL-27827 - Missing messageprovider:message language string 2011-06-23 20:33:12 +02:00