Commit graph

12718 commits

Author SHA1 Message Date
Rossiani Wijaya
de2e165a3a MDL-30636 Lesson Module: fixed essay answer display format 2011-12-19 15:08:15 +08:00
Sam Hemelryk
92e72b0a86 Merge branch 'MDL-30683' of git://github.com/timhunt/moodle 2011-12-19 14:17:20 +13:00
Sam Hemelryk
d0fe873623 Merge branch 'MDL-29176' of git://github.com/timhunt/moodle 2011-12-19 12:28:52 +13:00
Sam Hemelryk
b53bea8167 Merge branch 'MDL-30758' of git://github.com/timhunt/moodle 2011-12-19 09:27:48 +13:00
Aparup Banerjee
441088d647 Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle 2011-12-16 11:36:47 +08:00
Dan Marsden
1a50148e8b MDL-28728 SCORM Add missing string 2011-12-16 11:22:39 +13:00
Tim Hunt
800944b015 MDL-29176 quiz editing: can't move questions onto a new page. 2011-12-15 19:32:37 +00:00
Tim Hunt
29ded2d68a MDL-30646 default qbank sort should only use visible columns. 2011-12-15 18:39:21 +00:00
Henning Bostelmann
3367f14b0a MDL-29266 Assignment grading: save state of "send notifications" box 2011-12-15 17:17:37 +00:00
Tim Hunt
41d5cbc1cd MDL-30758 quiz_statistics report fails if all 1st attempts require grading 2011-12-15 12:51:20 +00:00
Tim Hunt
490668bbe1 MDL-30592 / MDL-27183 quiz statistics: fix merge problem.
These two fixes changes the same file in different ways, causing breakage.
2011-12-15 11:21:56 +00:00
Marina Glancy
d021e5b40c MDL-30733: synchronizing view_feedback with parent function to work with advanced grading
assignment_upload::view_feedback was overriden. It is altered the same way as parent function was to work with advanced grading and so it is displayed correctly in user complete report
2011-12-15 16:44:14 +08:00
Aparup Banerjee
73c0d46416 Revert "MDL-30482 create new capability for viewing glossary entries"
This reverts commit b92ac8c079.
2011-12-15 15:49:55 +08:00
Aparup Banerjee
22154a3187 Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary" (test failed)
This reverts commit aa423bd0e6.
2011-12-15 15:47:46 +08:00
Eloy Lafuente (stronk7)
12727710d4 Merge branch 'MDL-30592' of git://github.com/timhunt/moodle 2011-12-14 22:03:26 +01:00
Tim Lock
10be5e22f3 MDL-30419: IMS package content missing when using Blackboard packages 2011-12-14 21:36:20 +01:00
Jason Fowler
aa423bd0e6 MDL-30482 - Glossary - Adding capability to other areas using glossary 2011-12-14 15:00:30 +08:00
Aparup Banerjee
d4f2755206 Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary"
This reverts commit d79de196c9.
2011-12-14 14:59:16 +08:00
Aparup Banerjee
2faa009fa1 Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle 2011-12-14 13:35:38 +08:00
Sam Hemelryk
0142e3eec1 Merge branch 'master_MDL-30576' of git://github.com/mayankgupta/moodle 2011-12-14 17:22:26 +13:00
Sam Hemelryk
cd3061294a Merge branch 'MDL-27183' of git://github.com/timhunt/moodle 2011-12-14 17:17:10 +13:00
Sam Hemelryk
5c1c0900a5 Merge branch 'MDL-30463' of git://github.com/rwijaya/moodle 2011-12-14 14:26:42 +13:00
Gerard (Gerry) Caulfield
d6d8c49432 MDL-29400 Update the upload and uploadsingle assignment classes to so
that they only display the assignment submitted status when it has
actually been submitted.
2011-12-14 05:54:10 +08:00
Tim Hunt
6d54b0f77f MDL-30683 don't show overall feedback in the quiz grades report.
The grades are small, while the feedback can be big, which breaks the table layout.
2011-12-13 16:50:19 +00:00
Aparup Banerjee
981661f745 Merge branch 'master_MDL-30577' of git://github.com/mayankgupta/moodle 2011-12-13 14:45:35 +08:00
Aparup Banerjee
099f23b7d7 Merge branch 'wip-MDL-30482-master' of git://github.com/phalacee/moodle 2011-12-13 11:11:47 +08:00
Mayank Gupa
a16abd537d MDL-30645, Fixing evaluation of default value of CMI elements. 2011-12-13 10:12:27 +08:00
Sam Hemelryk
746e7c4a5e Merge branch 'MDL-30677' of git://github.com/timhunt/moodle 2011-12-13 11:20:22 +13:00
Rossiani Wijaya
7349495160 MDL-30463 lesson module: add space between yes and no options on start last attempt page 2011-12-12 17:14:45 +08:00
Mayank Gupa
3cf721bf23 Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30577 2011-12-12 13:20:44 +05:30
Mark Nielsen
8fbb55ac8b MDL-29048 Glossary Force glossary type to secondary while trying to duplicate a mail glossary 2011-12-12 12:33:56 +05:30
Aparup Banerjee
c45c1e1f20 Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle 2011-12-12 14:36:59 +08:00
Mayank Gupa
7ec0b1a936 Merge branch 'master' of git://github.com/moodle/moodle into master_MDL-30576 2011-12-12 10:53:23 +05:30
Jason Fowler
d79de196c9 MDL-30482 - Glossary - Adding capability to other areas using glossary 2011-12-12 10:46:10 +08:00
Charles Fulton
b92ac8c079 MDL-30482 create new capability for viewing glossary entries 2011-12-12 09:59:41 +08:00
Sam Hemelryk
d35fc666d6 Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle 2011-12-12 13:54:48 +13:00
Dan Marsden
a12b1d751d MDL-28728 SCORM - only show delete button if data exists for this user in this scorm 2011-12-11 19:10:28 +13:00
Dan Marsden
d32e353e35 MDL-28728 SCORM - add capability to allow users to delete own attempts - given to no-one by default. 2011-12-11 19:10:28 +13:00
Petr Skoda
33dca15616 MDL-30613 use standard https checks 2011-12-09 21:28:04 +01:00
Tim Hunt
fdb5bc03f5 MDL-30592 quiz statistics, ensure images in the question text appear. 2011-12-09 19:23:46 +00:00
Tim Hunt
3f11d7f923 MDL-30677 quiz: fix attempt counts when a student is in several groups. 2011-12-09 18:46:47 +00:00
Tim Hunt
e4977ba5c6 MDL-27183 quiz reports: don't show data to users not in any group
if the quiz is set to separate groups, and the user does not have access all groups.
2011-12-09 18:04:22 +00:00
Mitsuhiro
ac4e8c3387 MDL-30198 Glossary Changing string during imports 2011-12-09 10:01:33 +05:30
Aparup Banerjee
29459d8e15 Merge branch 'MDL-30558' of git://github.com/timhunt/moodle 2011-12-09 10:46:23 +08:00
Aparup Banerjee
4000fce1a3 Merge branch 'master_MDL-26974' of git://github.com/danmarsden/moodle 2011-12-09 10:19:22 +08:00
Aparup Banerjee
ce78f1d6f5 Merge branch 'master_MDL-30579' of git://github.com/mayankgupta/moodle 2011-12-09 10:13:22 +08:00
Tim Hunt
554de0d73a MDL-27314 quiz reports: fix JS confirmation before deleting attempts. 2011-12-09 02:33:47 +01:00
Aparup Banerjee
46f2a9366a MDL-30604 Added upgrade lines to upgrade.php(s) 2011-12-09 01:28:59 +01:00
Eloy Lafuente (stronk7)
bc4869a828 Merge branch 'MDL-29579' of git://github.com/timhunt/moodle 2011-12-08 23:36:49 +01:00
Aparup Banerjee
1f8c6a9012 Merge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle 2011-12-08 17:00:37 +08:00