Commit graph

49086 commits

Author SHA1 Message Date
Dan Marsden
93e46331fc MDL-28721 SCORM - respect hide navigation buttons setting. 2011-08-12 11:06:58 +12:00
Eloy Lafuente (stronk7)
7969f1ecf5 weekly release 2.2dev 2011-08-12 00:18:07 +02:00
Marina Glancy
03909d79e4 MDL-26754: Removed unnecessary include 2011-08-11 13:39:30 +08:00
Sam Hemelryk
bd4624765e MDL-25636 block_html Fixed up missing format config if block restored from early 2.0 backup 2011-08-11 11:17:37 +08:00
Eloy Lafuente (stronk7)
76f063fa5d Merge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle 2011-08-10 23:03:06 +02:00
Eloy Lafuente (stronk7)
89c6def316 Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle 2011-08-10 22:46:42 +02:00
sam marshall
ad275cb4ad MDL-28643 Fix debugging message when deleting activity with grade completion 2011-08-10 11:02:56 +01:00
sam marshall
26848c48f9 MDL-28301 Completion: Replaced completion tickbox icons with nicer ones 2011-08-10 11:02:05 +01:00
sam marshall
05b7cd7ae9 MDL-27491 Add 'complete on view' support to wiki, survey 2011-08-10 10:56:14 +01:00
Daren Chandisingh
f1f70bd4dd MDL-23872 Forms Library : Updated MoodleQuickForm to honour setConstant(), prevents injection. 2011-08-10 15:17:53 +08:00
Sam Hemelryk
92636dfb5a Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle 2011-08-10 14:04:22 +08:00
Sam Hemelryk
751a6d3c29 Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle 2011-08-10 13:39:32 +08:00
Eloy Lafuente (stronk7)
09e35896d4 Merge branch 'MDL-27631' of git://github.com/mkassaei/moodle 2011-08-10 03:00:17 +02:00
Eloy Lafuente (stronk7)
7e988ed160 Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle 2011-08-10 02:47:57 +02:00
Eloy Lafuente (stronk7)
628e2396af Merge branch 'w31_MDL-27597_m22_catlike' of git://github.com/skodak/moodle 2011-08-10 02:34:51 +02:00
Dan Marsden
6d954dd372 MDL-28295 SCORM change mangement of pop-up windows, load full SCORM API in existing window - this fixes an issue with IE 7 and httpreq communication 2011-08-10 12:19:49 +12:00
Eloy Lafuente (stronk7)
1ddecae7c7 Merge branch 'MDL-23967' of git://git.luns.net.uk/moodle 2011-08-10 02:04:55 +02:00
Eloy Lafuente (stronk7)
6d067fec6f Merge branch 'MDL-28059' of git://git.luns.net.uk/moodle 2011-08-10 01:58:03 +02:00
Eloy Lafuente (stronk7)
b16d8f59ab Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle 2011-08-10 01:10:27 +02:00
Eloy Lafuente (stronk7)
43c88235c5 Merge branch 'w31_MDL-28533_m22_columnperf' of git://github.com/skodak/moodle 2011-08-09 19:30:54 +02:00
Tim Hunt
25d9a6a664 MDL-28653 question output. Add a class to the main div based on question state.
This makes it possible themes do cool things. For example change more of the display depending on whether the answer was correct or not.
2011-08-09 11:31:37 +01:00
Eloy Lafuente (stronk7)
8a015bdb84 Merge branch 'MDL-28565_M' of git://github.com/nebgor/moodle 2011-08-09 10:13:18 +02:00
Henning Bostelmann
35ee6e333d MDL-28655 qtype_calculated question engine upgrade: fix return value 2011-08-09 09:13:09 +01:00
Eloy Lafuente (stronk7)
1c001177ea Merge branch 'MDL-28604' of git://github.com/timhunt/moodle 2011-08-09 09:41:53 +02:00
Tony Levi
88b3eb8bb5 MDL-27030: Fix quiz overview report showing incorrect grades on regraded attempts
Conflicts:

	mod/quiz/report/overview/report.php
2011-08-08 23:34:54 +01:00
Eloy Lafuente (stronk7)
1cdb96319d MDL-28493 scorm - fix whitespace 2011-08-08 18:15:42 +02:00
Tim Hunt
d572f4497f MDL-28654 fix path for TinyMCE in lib/thirdpartylibs.xml. 2011-08-08 16:39:58 +01:00
Petr Skoda
ca39e6d2fd Merge branch 'master_MDL-28601' 2011-08-08 16:18:08 +02:00
Petr Skoda
260cf4c2fd Merge branch 'MDL-28620' of git://github.com/jbrisland/moodle 2011-08-08 15:32:29 +02:00
Tim Hunt
6ef90fdef9 MDL-28652 qtype calculated, bad display of placeholder names on the editing form. 2011-08-08 13:13:37 +01:00
Aparup Banerjee
e637e76a25 MDL-28565 General - updated lang files License link to docs.moodle.org/dev/License 2011-08-08 17:16:07 +08:00
Aparup Banerjee
9fdab2fe73 MDL-28565 General - updated License and Credits links
to docs.moodle.org/dev/License and docs.moodle.org/dev/Credits
2011-08-08 17:15:57 +08:00
Sagie Maoz
0d5e5644b8 MDL-26721 automated backups - Fix typo
Causing the 'role assignment' backup inclusion to be tied to the users

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
2011-08-08 15:40:55 +08:00
Sam Hemelryk
01352e33cc Merge branch 'master_MDL-28311' of git://github.com/danmarsden/moodle 2011-08-08 15:05:56 +08:00
Sam Hemelryk
e97584bcf1 Merge branch 'mdl-28517' of git://github.com/colchambers/moodle 2011-08-08 14:22:51 +08:00
Dan Poltawski
d8d1f9e35e MDL-28569 blocks/rss_client - RSS feed autodiscovery fails with ampersands
Simpliepie is quoting urls and we need the url to be unescaped
2011-08-08 14:11:13 +08:00
Sam Hemelryk
0d38abcf38 Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution 2011-08-08 13:58:10 +08:00
Sam Hemelryk
9e4b5b45a4 Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle 2011-08-08 13:43:42 +08:00
Rossiani Wijaya
03929beaa1 MDL-27752 Calendar export: fixed typo in url parameter 2011-08-08 13:01:09 +08:00
Sam Hemelryk
a3ff929807 Merge branch 'MDL-28406_block_duplicate' of git://github.com/andyjdavis/moodle 2011-08-08 11:18:14 +08:00
Sam Hemelryk
16c009c5bf Merge branch 'MDL-28602' of git://github.com/timhunt/moodle 2011-08-08 11:06:54 +08:00
Sam Hemelryk
067b8a5556 Merge branch 'MDL-28593' of git://github.com/timhunt/moodle 2011-08-08 11:04:19 +08:00
Sam Hemelryk
9d85b62c42 Merge branch 'MDL-28612' of git://github.com/timhunt/moodle 2011-08-08 11:00:38 +08:00
Sam Hemelryk
2f86bcfffa Merge branch 'MDL-28618' of git://github.com/timhunt/moodle 2011-08-08 10:57:11 +08:00
Sam Hemelryk
b1251c9008 Merge branch 'w31_MDL-27586_m22_browser' of git://github.com/skodak/moodle 2011-08-08 10:46:41 +08:00
Sam Hemelryk
cb09753feb Merge branch 'w31_MDL-27685_m22_pglike' of git://github.com/skodak/moodle 2011-08-08 10:26:20 +08:00
Sam Hemelryk
9be161c678 Merge branch 'w31_MDL-28382_m22_iis' of git://github.com/skodak/moodle 2011-08-08 10:20:15 +08:00
Sam Hemelryk
7d85a4e226 Merged branch 'w31-MDL-28412_m22_iconv' of git://github.com/skodak/moodle.git with english string improvements 2011-08-08 10:16:23 +08:00
Sam Hemelryk
3b8502658f Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle 2011-08-08 10:09:31 +08:00
Sam Hemelryk
406bf830cd Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle 2011-08-08 10:06:06 +08:00