Commit graph

12183 commits

Author SHA1 Message Date
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Sam Hemelryk
0ca579f2cd MDL-11047 mod_quiz: bumped version in upgrade after conflict resolution 2012-03-20 16:46:19 +13:00
Sam Hemelryk
270bdf5265 Merge branch 'MDL-11047' of git://github.com/mackensen/moodle
Conflicts:
	mod/quiz/version.php
2012-03-20 14:04:04 +13:00
Sam Hemelryk
b896c12bca Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle 2012-03-20 11:34:21 +13:00
Sam Hemelryk
f7dbc2814c Merge branch 'MDL-32064' of git://github.com/timhunt/moodle 2012-03-20 10:37:38 +13:00
Sam Hemelryk
47def74bb8 Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle 2012-03-19 20:06:40 +13:00
Rajesh Taneja
476aea8d8b MDL-26674 wiki2.0: cleaned wiki event logging patch 2012-03-19 11:15:06 +08:00
Diane Villemure
b7921fc458 MDL-26674 wiki2.0: Fixed wiki activity log 2012-03-19 10:20:18 +08:00
Petr Skoda
fabbf4398b MDL-32094 some nasty quickforms hacks that should help with E_STRICT
Note: we have stopped tracking our QuickForms hacks long ago.
2012-03-18 18:39:37 +01:00
Petr Skoda
f20edd5208 MDL-32094 fix various E_STRICT compatibility problems 2012-03-18 18:37:24 +01:00
Petr Skoda
0ed6f71232 MDL-32094 fix E_STRICT issues in lesson API
It is not possible to change method signatures in PHP...
2012-03-18 18:36:04 +01:00
Petr Skoda
e7755fc627 MDL-32094 fix E_STRICT issues in assignment 2012-03-18 18:32:17 +01:00
Tim Hunt
ff3b7c85db MDL-32064 quiz navigation: JS form submit must fire submit event handlers. 2012-03-16 14:55:16 +00:00
Petr Skoda
60791f18cf MDL-32079 folder revision must be incremented after any file change 2012-03-16 10:11:07 +01:00
Dan Marsden
c1b81ff623 MDL-32080 SCORM - remove old css 2012-03-16 13:16:05 +13:00
Tim Hunt
0f0c0228b0 MDL-19125 module restrictions: document change in mod/upgrade.txt 2012-03-15 17:13:54 +00:00
Tim Hunt
88eca3cd26 MDL-19125 module restrictions: addinstance capabilities for all mods 2012-03-15 17:13:43 +00:00
Charles Fulton
33c8d37b6f MDL-11047 quiz: enable sequential navigation 2012-03-15 10:09:27 -07:00
Andrew Robert Nicols
536328fb0a MDL-32065 Allow feedback images to be themed 2012-03-15 11:48:21 +00:00
Aparup Banerjee
42c8e4d66d Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle 2012-03-13 15:51:53 +08:00
Sam Hemelryk
c8c00cee80 MDL-29745 Fixed white space 2012-03-13 16:36:37 +13:00
Sam Hemelryk
a28c6b40fe Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle 2012-03-13 16:35:15 +13:00
Aparup Banerjee
f3c5d3102d Merge branch 'MDL-30867' of git://github.com/rwijaya/moodle 2012-03-13 11:26:42 +08:00
Aparup Banerjee
6a0d8209d1 MDL-31910 Quiz : fixed whitespace 2012-03-13 10:15:05 +08:00
M Kassaei
137d60b66f MDL-31910 Quiz : Error on Manual Grading report 2012-03-13 10:13:27 +08:00
Ankit Agarwal
e2f6cb436a MDL-22895 scorm: Fixed up issues with graph report 2012-03-13 09:31:01 +08:00
Sam Hemelryk
db6d54c337 Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:10:00 +13:00
Sam Hemelryk
fd9dbadb15 Merge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:04:44 +13:00
Sam Hemelryk
595dc849dd Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle 2012-03-13 14:00:41 +13:00
Eloy Lafuente (stronk7)
b20bb8454a Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle 2012-03-13 00:15:59 +01:00
Sam Hemelryk
80fa598515 Merge branch 'MDL-31702' of git://github.com/timhunt/moodle 2012-03-13 10:34:03 +13:00
Sam Hemelryk
3108b6412c Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle 2012-03-13 10:10:36 +13:00
Ankit Kumar Agarwal
e61a71379c MDL-29745 SCORM Introducing new Graphs report for scorm module 2012-03-12 15:02:26 +08:00
Sam Hemelryk
fe0979ea3d Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/styles.css
2012-03-12 17:29:39 +13:00
Sam Hemelryk
52cbd9cbd2 MDL-27304 mod_wiki: Fixed up phpdocs for globals 2012-03-12 17:20:37 +13:00
Sam Hemelryk
2774a46792 Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle 2012-03-12 17:20:01 +13:00
Charles Fulton
2d20d5488a MDL-31664 fix invalid boolean to string comparison 2012-03-12 17:02:38 +13:00
Sam Hemelryk
d9fc82157b Merge branch 'MDL-31811-master-2' of git://git.luns.net.uk/moodle 2012-03-12 15:15:23 +13:00
Petr Skoda
bb88a54d06 MDL-31985 remove text sizes from all install.xml files 2012-03-11 15:55:37 +01:00
Tim Hunt
ba3fedfb49 MDL-31702 quiz: clarify error message that has been confusing people. 2012-03-09 11:28:20 +00:00
Rossiani Wijaya
d3254cebfc MDL-30867 Lesson module: fix lesson essay question formtting to be consistent with user selection 2012-03-09 17:32:18 +08:00
Eloy Lafuente (stronk7)
d395ad7042 Revert "[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block."
This reverts commit ebadb9b9a6.
2012-03-09 01:58:09 +01:00
Eloy Lafuente (stronk7)
61b0512c44 Revert "MDL-31708 wiki groups: whitespace fix"
This reverts commit 6273fb8377.
2012-03-09 01:58:01 +01:00
Dan Marsden
eb3a62d293 MDL-31942 Choice - remove deprec func 2012-03-08 20:37:17 +13:00
Eloy Lafuente (stronk7)
427ad4d3c3 Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle 2012-03-08 00:48:04 +01:00
Eloy Lafuente (stronk7)
0b56e99431 MDL-23787 data: Init 2 arrays (global scope) that may conflict with other global scope code 2012-03-07 01:47:31 +01:00
Eloy Lafuente (stronk7)
8650e13f9b Merge branch 'wip-MDL-23787-master' of git://github.com/marinaglancy/moodle 2012-03-07 01:22:54 +01:00
Dan Marsden
85a2d566e2 MDL-31888 SCORM prevent scrollbars on yui div 2012-03-07 09:01:45 +13:00
Ruslan Kabalin
8ef93c7029 MDL-31919 Fix assignment overview output to respect gradebook grading.
Currenly, if assigment has been graded in gradebook only, in the assigment
overview it is listed as not graded.
2012-03-06 16:55:29 +00:00
Charles Fulton
537c237b18 MDL-27304 wiki: link to user's course profile 2012-03-06 08:33:12 -08:00