Aparup Banerjee
26b85f89bc
Merge branch 'w51_MDL-30735_m23_cron' of git://github.com/skodak/moodle
2011-12-19 11:52:33 +08:00
Sam Hemelryk
042efe1aa7
Merge branch 'w51_MDL-30789_m23_enrolupdatestatus' of git://github.com/skodak/moodle
2011-12-19 16:22:42 +13:00
Sam Hemelryk
7554371cd9
Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle
2011-12-19 15:21:56 +13:00
Sam Hemelryk
c3f90a5722
Merge branch 'MDL-37049' of git://github.com/jamiepratt/moodle
2011-12-19 15:06:01 +13:00
Sam Hemelryk
92e72b0a86
Merge branch 'MDL-30683' of git://github.com/timhunt/moodle
2011-12-19 14:17:20 +13:00
Mary Evans
e580c65962
MDL-30500 Fix for Sky High report & print layout
2011-12-19 00:06:10 +00:00
Sam Hemelryk
d0fe873623
Merge branch 'MDL-29176' of git://github.com/timhunt/moodle
2011-12-19 12:28:52 +13:00
Sam Hemelryk
90179a5093
Merge branch 'MDL-30734' of git://github.com/timhunt/moodle
2011-12-19 11:52:49 +13:00
Sam Hemelryk
6ccf06637f
Merge branch 'MDL-30742' of git://github.com/timhunt/moodle
2011-12-19 11:37:10 +13:00
Sam Hemelryk
09608abe56
Merge branch 'MDL-30744' of git://github.com/timhunt/moodle
2011-12-19 10:21:11 +13:00
Sam Hemelryk
b53bea8167
Merge branch 'MDL-30758' of git://github.com/timhunt/moodle
2011-12-19 09:27:48 +13:00
Petr Skoda
af7177dbcb
MDL-30789 add new update_status() method to enrol plugins and improve enrol cache invalidation
2011-12-18 17:30:17 +01:00
Petr Skoda
e3258164c6
MDL-30735 fix cron maintenancerun detection
...
Credit goes to Rodrigo Belluomini Cardilli.
2011-12-17 14:17:19 +01: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
41d5cbc1cd
MDL-30758 quiz_statistics report fails if all 1st attempts require grading
2011-12-15 12:51:20 +00:00
Tim Hunt
6f4c71f5fe
MDL-30744 question editing permissions. Update to new accessslib.php code.
...
I don't believe this will actually fix the reported problem, which I
cannot reproduce, but it should give us much better error messages, at
which point we can fix it.
2011-12-15 11:54:58 +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
Jamie Pratt
a24e35701f
MDL-30749 fixing typo referring to question instead of answer object
2011-12-15 15:06:45 +07:00
Aparup Banerjee
73c0d46416
Revert "MDL-30482 create new capability for viewing glossary entries"
...
This reverts commit b92ac8c07989a7a7d8659169d465341e55a95d72.
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 aa423bd0e6a7b6c1f6cee4f95b46300e412551b4.
2011-12-15 15:47:46 +08:00
Eloy Lafuente (stronk7)
5c5ea474c4
MDL-30592 moodlelib: minor phpdocs/debug tweaks
2011-12-14 22:37:40 +01: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
Tim Hunt
b5f65ba14c
MDL-30742 restoring 1.9 backups with missing question data should be robust
2011-12-14 17:17:07 +00:00
Tim Hunt
ad73a2cb4e
MDL-30734 question engine: sum_usage_marks_subquery edge-case.
...
When all qas in a useage are 'gaveup' state, it gives NULL, not 0.0, for the total.
2011-12-14 14:29:00 +00: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 d79de196c9f0d19b54454e5109bb6b8ab34f07eb.
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
Aparup Banerjee
d2861a7b47
MDL-29325 fixed typo - camelcasing.
2011-12-14 13:12:57 +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
Eloy Lafuente (stronk7)
f477e8c1ce
Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle
2011-12-14 03:16:20 +01:00
Eloy Lafuente (stronk7)
5019c8ebb5
Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle
2011-12-14 02:37:04 +01:00
Sam Hemelryk
5c1c0900a5
Merge branch 'MDL-30463' of git://github.com/rwijaya/moodle
2011-12-14 14:26:42 +13:00
Sam Hemelryk
cd6ad1c1d3
Merge branch 'MDL-30140' of git://github.com/mouneyrac/moodle
2011-12-14 14:08:37 +13: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
0ef92d976c
Merge branch 'MDL-29772' of git://github.com/bostelm/moodle
2011-12-13 16:51:23 +08:00
Aparup Banerjee
952a77d1a8
MDL-29325 Enrol : reduced isset calls and improved readability
2011-12-13 16:37:00 +08:00
Aparup Banerjee
d919bd00b3
Merge branch 'master_MDL-29325' of git://github.com/danmarsden/moodle
2011-12-13 14:59:22 +08: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
c35d38161e
Merge branch 'MDL-30472-master' of git://github.com/ankitagarwal/moodle
2011-12-13 14:34:42 +08:00
Aparup Banerjee
036e9c7cbf
Merge branch 'MDL-30362-master-1' of git://git.luns.net.uk/moodle
2011-12-13 14:29:25 +08:00
Aparup Banerjee
1ff57577da
Merge branch 'MDL-30562' of git://github.com/timhunt/moodle
2011-12-13 13:48:43 +08:00
Aparup Banerjee
c4378f125b
Merge branch 'MDL-30655-master' of git://github.com/sammarshallou/moodle
2011-12-13 13:20:21 +08:00
Alexnader Bias
1b80a50418
MDL-30472 Course Making user lists sortable when lastacess field is hidden
2011-12-13 10:47:43 +05:30
Aparup Banerjee
9b91efe5bc
Merge branch 'MDL-30559' of git://github.com/timhunt/moodle
2011-12-13 12:02:05 +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
Petr Skoda
62988bf0bb
MDL-30575 more mail header cleanup
2011-12-13 10:23:41 +08:00