Commit graph

11112 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
34d5507ab8 Merge branch 'wip-MDL-28172-master' of git://github.com/samhemelryk/moodle 2011-07-06 01:52:32 +02:00
Eloy Lafuente (stronk7)
9a160c7c46 MDL-28196 quiz calls get_in_or_equal (fixing missing $DB) 2011-07-05 22:02:30 +02:00
Tim Hunt
b149b78859 MDL-28196 quiz calls get_in_or_equal (not DB->get_in_or_equal) in two places
Also, another minor error in one method call.
2011-07-05 14:29:30 +01:00
Rossiani Wijaya
54c37fbd88 MDL-27555 assignment module: remove 'submitted' option from optional setting for offline assignment type. 2011-07-05 15:33:33 +08:00
Aparup Banerjee
728ebac7f2 MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/" 2011-07-05 14:27:31 +08:00
Petr Skoda
3f8465ca4b MDL-28117 include repo lib when hacking file_picker renderer 2011-07-04 17:09:28 +02:00
Sam Hemelryk
b8d3c3f76e MDL-28172 forum: Fixed up overzealous check for portfolio enabled. 2011-07-04 15:04:16 +08:00
Dan Marsden
d9306a9c1f SCORM MDL-28110 fix string name 2011-07-03 12:51:56 +12:00
Dan Marsden
0ab985f918 SCORM MDL-28110 set default for forcejavascript to yes - add string explaining what it does. 2011-07-03 12:51:56 +12:00
Dan Marsden
ca4eda13b5 SCORM MDL-28111 tidy up formatting of code 2011-07-03 12:49:29 +12:00
Dan Marsden
f7b5c6aae6 SCORM MDL-28111 tidy up formatting of code 2011-07-03 12:49:29 +12:00
Dan Poltawski
2207a21bfe MDL-28100 - page resource was not using context for text filtering 2011-07-02 13:34:05 +01:00
Sun Zhigang
0e30d4c7c7 MDL-27934 Upload Assignment - Remove useless code 2011-07-02 09:52:28 +01: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
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
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
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
Eloy Lafuente (stronk7)
49752ecb59 Merge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle 2011-07-01 10:40:15 +02: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
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
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
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)
ca2b89d5df Merge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle 2011-06-30 01:10:51 +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)
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)
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)
ae5b0cde4d Merge branch 'MDL-27955_HEAD' of git://github.com/rwijaya/moodle 2011-06-29 15:42:26 +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
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
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)
5daa7279d4 MDL-28087 assignment: made the jabber notification of assignment grading better 2011-06-29 11:29:11 +08:00
Andrew Davis (andyjdavis)
3d942d5054 MDL-19864 database: temporarily commenting out the excel export option as its broken and cannot be quickly fixed. Use Open Office option for the time being. 2011-06-29 10:35:31 +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
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
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
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