Andrew Davis
08f06b1c24
MDL-30955 rating: corrected /rating/index.php as it was determining the maximum rating incorrectly for custom scales
2012-04-10 12:01:52 +07:00
Dan Poltawski
a98ff41f1a
Merge branch 'wip-MDL-27427-master' of git://github.com/phalacee/moodle
2012-04-10 12:04:06 +08:00
Dan Poltawski
f4bd3cd6c9
Merge branch 'MDL-32347' of git://github.com/timhunt/moodle
2012-04-10 11:34:12 +08:00
Dan Poltawski
44d70cc753
MDL-32299 quiz mod_form: fix help string typo
2012-04-10 11:29:57 +08:00
Dan Poltawski
26932315f1
Merge branch 'MDL-32299' of git://github.com/timhunt/moodle
2012-04-10 11:25:09 +08:00
Dan Poltawski
098312b149
Merge branch 'wip-mdl-30051' of git://github.com/rajeshtaneja/moodle
2012-04-10 11:05:59 +08:00
Dan Poltawski
2d74d8a612
Merge branch 'MDL-32318' of git://github.com/timhunt/moodle
2012-04-10 10:26:49 +08:00
Tim Hunt
59ea81767e
MDL-32300 quiz reports: proper frankenstyle prefixes on class names.
2012-04-10 10:04:55 +08:00
Dan Poltawski
4c8ec44828
Merge branch 'MDL-25801' of git://github.com/timhunt/moodle
2012-04-10 09:11:38 +08:00
Sam Hemelryk
0ccb4dcce0
Merge branch 'MDL-32349-master' of git://github.com/sammarshallou/moodle
2012-04-10 12:38:40 +12:00
Sam Hemelryk
50f7bbf95c
MDL-30843 admin: Fixed up label for attribute
2012-04-10 12:35:26 +12:00
Sam Hemelryk
5bfeb5ffd3
Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle
2012-04-10 12:34:37 +12:00
Sam Hemelryk
859a181627
Merge branch 'wip-mdl-32270' of git://github.com/rajeshtaneja/moodle
2012-04-10 10:53:34 +12:00
Sam Hemelryk
aef4aafa0b
Merge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle
2012-04-10 10:48:34 +12:00
Sam Hemelryk
93068559b7
Merge branch 'w15_MDL-32293_m23_timeout' of git://github.com/skodak/moodle
2012-04-10 10:43:08 +12:00
Sam Hemelryk
756d5f7610
Merge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle
2012-04-10 10:37:45 +12:00
Andreas Grabs
bf4fb3b317
MDL-32316 feedback: fix tem type label does honor trusted text
2012-04-10 00:26:08 +02:00
Petr Skoda
bcb368d988
MDL-32263 remove broken admin test in enrol_check_plugins()
2012-04-09 19:59:19 +02:00
Hugh Davenport
5b244e2bb0
MDL-32308 Fix error when testing id of guest user
2012-04-09 19:03:45 +02:00
Petr Skoda
0c5406ca93
MDL-32293 move the upgrade_set_timeout() function to lib/upgradelib.php
...
Credit goes to Eloy Lafuente.
2012-04-09 18:14:27 +02:00
Andrew Davis
13aa8f0e09
MDL-30819 grade: fixed column highlighting on the grader report
2012-04-09 12:28:00 +07:00
Andreas Grabs
31ff56202a
MDL-32124 - mails to non respondents are sent as plain text with html-tags
2012-04-07 17:29:52 +02:00
ppichet
57239949ac
MDL-32217 Setting options->unitgradingtype
2012-04-06 11:02:13 -04:00
Kordan
f0a8c9192b
MDL-32356 theme_formal_white: added blockpadding setting
2012-04-06 10:05:59 +02:00
sam marshall
ebb98bf53c
MDL-32349 Installing can time out with large number of plugins
2012-04-05 18:29:00 +01:00
Tim Hunt
a031b0f334
MDL-32347 questions: API improvement for the benefit of strict syntax.
2012-04-05 17:26:44 +01:00
Tim Hunt
b9832f2b87
MDL-32318 question preview: fix php stric syntax error
...
Also, cheating, and committing a whitespace fix in the same commit.
Conflicts:
question/engine/questionusage.php
2012-04-05 16:42:23 +01:00
Tim Hunt
ce74dcc3b6
MDL-32299 quiz mod_form: help icons for the review options
2012-04-05 16:25:32 +01:00
Tim Hunt
7e3ac96cbe
MDL-32300 quiz manual grading report: also do some other cleanup.
2012-04-05 15:33:09 +01:00
Tim Hunt
d42b8ac2f3
MDL-32300 quiz reports: proper frankenstyle prefixes on class names.
2012-04-05 15:33:07 +01:00
Tim Hunt
5127e52df7
MDL-25801 quiz editing: fix inconsistent grade-related terminology
...
AMOS BEGIN
MOV [totalpointsx,mod_quiz],[totalmarksx,mod_quiz]
AMOS END
2012-04-05 15:29:57 +01:00
Eric Merrill
f930cf6b41
MDL-32143 output lib: Add ability have override core icons in dataroot
...
Searches dataroot/pix/ and dataroot/pix_plugins/type/plugin for icons
to override base install
2012-04-05 08:50:16 -04:00
Aparup Banerjee
9ad535c550
weekly release 2.3dev
2012-04-05 16:39:52 +08:00
Aparup Banerjee
5ea892f8c9
fix permissions
2012-04-05 16:36:10 +08:00
Aparup Banerjee
69b101f811
Merge branch 'install_master' of git://github.com/amosbot/moodle
2012-04-05 16:19:27 +08:00
Dan Poltawski
8411c24ec1
MDL-20438 pluginlib: Don't run update checker on install
...
This is unlikely to be the long term solution and so MDL-32329 has been
created to address that
2012-04-04 21:02:07 +08:00
Dan Poltawski
86cfd9966a
MDL-32220 question import: readquestions arguments change
...
Removed the context parameter for blackboard and blackboard_six formats.
This parameter was removed in 4d188926
2012-04-04 14:46:54 +08:00
Aparup Banerjee
5661f7b454
Merge branch 'wip-MDL-31631-m23' of git://github.com/samhemelryk/moodle
2012-04-04 13:40:58 +08:00
Dan Poltawski
da859ecf46
MDL-20438 Upgrade version number to triger /admin/ upgrade
2012-04-04 11:18:43 +08:00
Dan Poltawski
660c4d4643
MDL-20438 pluginlib: Fix trivial whitespace issues issues
...
Also fixed a comment typo I spotted whilst reviewing
2012-04-04 11:18:09 +08:00
Dan Poltawski
a973d320f1
Merge branch 'MDL-20438-update-notification' of git://github.com/mudrd8mz/moodle
2012-04-04 11:17:43 +08:00
Sam Hemelryk
b8f452165a
MDL-32009 reverting changes as they break installation
2012-04-04 14:37:37 +12:00
Sam Hemelryk
e96b10b121
MDL-32009 message: Small changes before integration
2012-04-04 14:20:07 +12:00
Sam Hemelryk
f1b06f6d54
Merge branch 'MDL-32009-master-1' of git://git.luns.net.uk/moodle
2012-04-04 14:19:32 +12:00
Eloy Lafuente (stronk7)
97e84c80b0
MDL-32149 remove some now breaking expectError() uses.
...
I've tested that unit with debug developer, debug notices and
debug none and it passes always. So, as far as I cannot find
any reason to have those expectError() there... they are out now.
2012-04-04 03:44:10 +02:00
Eloy Lafuente (stronk7)
a3e7cca432
MDL-32149 Delete two more portfolio leftovers preventing simpletests to run
...
(b60d21747f1ba1b52add865690fb622cdcf7b3b0 is where
all the portfolio testing stuff was deleted)
2012-04-04 03:22:05 +02:00
Eloy Lafuente (stronk7)
2000cd85da
Merge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle
2012-04-04 01:32:15 +02:00
Petr Skoda
d78e33488a
MDL-32149 adding test changes from MDL-32081
2012-04-04 01:31:43 +02:00
Eloy Lafuente (stronk7)
959a709ebe
Merge branch 'MDL-32240' of git://github.com/timhunt/moodle
2012-04-04 00:10:37 +02:00
Eloy Lafuente (stronk7)
eeb3295fd8
Merge branch 'wip-MDL-32265-m23' of git://github.com/samhemelryk/moodle
2012-04-03 23:59:07 +02:00