13787 Commits

Author SHA1 Message Date
Dan Poltawski
68265ee2d6 Merge branch 'MDL-34403' of https://github.com/mpetrowi/moodle 2013-04-25 12:49:38 +01:00
Matt Petro
f5f3658480 MDL-34403 mod quiz: fix error during enrolment 2013-04-24 15:00:06 -04:00
Dan Poltawski
f1b0908b8a MDL-38597 forum: fix incompetent programmer error ;-)
Shameful, Fred!
2013-04-24 10:02:41 +01:00
Dan Poltawski
6f0fdc9bb2 Merge branch 'MDL-38597-master-int' of git://github.com/FMCorz/moodle 2013-04-24 09:57:22 +01:00
Dan Poltawski
c1ae8606bd Merge branch 'MDL-38572-master' of git://github.com/FMCorz/moodle 2013-04-24 09:53:25 +01:00
Dan Poltawski
9da8c53295 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 2013-04-24 09:08:23 +01:00
Dan Poltawski
e6c91f99ec Merge branch 'MDL-38892' of git://github.com/rwijaya/moodle 2013-04-24 08:16:37 +01:00
Rossiani Wijaya
819b1de681 MDL-38892 data module: Fixed action setType to use PARAM_ALPHANUM 2013-04-24 13:49:09 +08:00
Davo Smith
c23ff8e3a5 MDL-39219 mod_scorm - make sure YUI JSON module is loaded 2013-04-23 18:58:09 +01:00
Dan Poltawski
88dbfc453e Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle 2013-04-23 12:50:44 +01:00
Frederic Massart
fbe9f668b2 MDL-38597 forum: Reformat the module settings form 2013-04-23 14:52:09 +08:00
Ankit Agarwal
647a3fc81c MDL-39296 scorm reports: Fix undefined variables in graphs report 2013-04-23 12:03:00 +08:00
Rossiani Wijaya
2e0ba150b3 MDL-38892 data module: Fixed setType warning 2013-04-23 09:57:58 +08:00
Dan Poltawski
fe5bb43ae5 Merge branch 'MDL-39264-master-int' of git://github.com/FMCorz/moodle 2013-04-22 17:23:43 +01:00
Dan Poltawski
83a9917314 MDL-37514 mod_quiz: fix trailing whitespace 2013-04-22 14:20:58 +01:00
Alex Leontiev
bd166e618f MDL-37514 module.js: fix .js for auto quiz submission in preview mode
The issue: when we attempt the quiz as teacher/admin and timer is up,
quiz is not submitted, even though "Open attempts are submitted
automatically" is set. I've changed the javascript for a timer,
responsible for submission, removing the special behaviour in case of
preview mode. Note, that when the admin/teacher is taking a quiz, the
"preview" mode is automatically switched on.

It is a bit strange, since in the javascript there was clearly no
expressed intention to really submit quiz in preview, even when timer
hits. It does not really seem like a accidental bug, rather it looks
like some misunderstanding. Worse still, it may happen that I did not
understand the intentions of previous editor and ruined some
functionality. Because of this, and the fact that this is my first bug,
I would like to ask about the peer review! Please, see my comments in
bug discussion for the testing steps.

Conflicts:
	mod/quiz/module.js
2013-04-22 14:13:53 +01:00
Dan Poltawski
e65dfc0275 Merge branch 'MDL-39186' of git://github.com/timhunt/moodle 2013-04-22 13:05:53 +01:00
Dan Poltawski
8c82b67ef0 Merge branch 'MDL-38603-workshop-form' of git://github.com/mudrd8mz/moodle 2013-04-22 12:47:10 +01:00
Dan Poltawski
3a3621821a Merge branch 'MDL-39173-master' of git://github.com/damyon/moodle 2013-04-22 11:41:41 +01:00
Damyon Wiese
f5e9aa843c Merge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle 2013-04-22 15:11:59 +08:00
Damyon Wiese
00ec4acc8f Merge branch 'MDL-39182_master' of https://github.com/markn86/moodle 2013-04-22 14:00:11 +08:00
Mark Nelson
f5ad424b11 MDL-39182 mod_forum: display the post threshold warning message in a more noticeable area 2013-04-22 13:33:36 +08:00
Frederic Massart
613abe1b02 MDL-38572 assign: Improving usability of the module form 2013-04-22 13:28:38 +08:00
Frederic Massart
47f0ae5908 MDL-39264 chat: Reformat module settings form 2013-04-22 11:03:28 +08:00
Damyon Wiese
b363d54ccd Merge branch 'MDL-39050' of git://github.com/timhunt/moodle 2013-04-22 10:25:46 +08:00
Sam Hemelryk
54ed002fdc Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle 2013-04-22 13:41:45 +12:00
Adrian Greeve
e06d54289d MDL-39118 - mod_data: removed areamaxbytes option for uploading files and images.
Setting the maximum size for a file or picture field to the course upload limit
would send a value of 0 to the file picker. This patch checks for this 0 value
and handles it appropriately.
2013-04-22 09:28:51 +08:00
Tim Hunt
ba86e1d1ee MDL-39186 quiz password form: set param types. 2013-04-19 18:28:59 +01:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle
Conflicts:
	mod/scorm/module.js
2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle 2013-04-19 15:11:33 +01:00
Tim Hunt
53f8948899 MDL-39050 quiz access rules: settings.php files should work. 2013-04-19 11:50:25 +01:00
Rajesh Taneja
1fe56a2a00 MDL-38851 Administration: Fixed setType in admin section 2013-04-19 15:18:33 +08:00
Damyon Wiese
dd3b3a81d1 Merge branch 'MDL-39167' of git://github.com/timhunt/moodle 2013-04-19 13:13:28 +08:00
Damyon Wiese
29e2fecb44 MDL-39173 Assign - Remove permissions check and OUTPUT from previous patch
The permissions check is not correct (even users with grade capability should not
see user identities) and $assignment->get_renderer() is preferred over $OUTPUT.
2013-04-19 13:05:12 +08:00
Sam Chaffee
0399580003 MDL-39173 Assign - Enable comments for blind marking assignments (anonymous ones) 2013-04-19 13:03:05 +08:00
Sam Hemelryk
2b2b967ecb MDL-38646 mod_folder: improved upgrade of showexpanded 2013-04-19 16:28:29 +12:00
Sam Hemelryk
a03fdbb099 Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle 2013-04-19 16:23:21 +12:00
Sam Hemelryk
52b4bd37e7 Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle 2013-04-19 14:41:25 +12:00
Sam Hemelryk
4d35c88e10 Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle 2013-04-19 13:53:55 +12:00
Sam Hemelryk
ff76b6044b Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle 2013-04-19 13:48:32 +12:00
Rex Lorenzo
57e228045b MDL-38646 folder: change column from show_expanded to showexpanded 2013-04-18 17:28:35 -07:00
David Mudrák
9e31e23d60 MDL-38603 Reorganise Workshop settings form
Example submissions settings moved into a dedicated section.
Self-assessment setting moved to the assessment section. There is no
need for the dedicated Workshop features section any more. All Workshop
feedback settings moved into a dedicated section.

Reorganised grading settings - the grading strategy put into the top
place as it is the essential setting. All other three settings are
related to calculating actual grades.

No advanced setting fields in the Workshop form. Mixing collapsible
sections with advanced fields (that are not even marked as "advanced"
any more) does not work well.

AMOS BEGIN
 CPY [feedback,mod_assign],[feedbacksettings,mod_workshop]
AMOS END
2013-04-18 23:31:35 +02:00
David Mudrák
d34ea7dc33 MDL-38603 Deprecate usepeerassessment setting in Workshop
There was a plan to make use of it initially when Workshop was rewritten
for Moodle 2.0. The idea was that the Workshop could be switched into a
simplified mode where teachers only make assessments (with all the
grading strategies available). But things evolved since then and now we
have Advanced grading methods available in the new Assignment module
that solves the use case well. So, having this option available is not
only confusing but - looking at the code - pretty useless.

For now, I am just hiding the setting from the settings form and the
code always considers it as if it was enabled. In the future, the field
can disappear from the database, too.
2013-04-18 23:10:10 +02:00
Davo Smith
c4dccb99fb MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility 2013-04-18 12:44:24 +01:00
Tim Hunt
d823a63db0 MDL-39167 quiz access rules: need to validate their settings.
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
2013-04-17 14:24:38 +01:00
Dan Poltawski
51850ccaf8 Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle 2013-04-17 12:37:23 +01:00
Dan Poltawski
0107a90fe8 Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle 2013-04-17 12:32:39 +01:00
Frederic Massart
ad4bbda9eb MDL-38573 choice: Reformat settings form 2013-04-17 15:54:59 +08:00
Mark Nelson
4a8a72656d MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning 2013-04-17 15:20:41 +08:00
Damyon Wiese
78d9d52a0a MDL-38710 assign: Fix one typo and change one param to PARAM_BOOL 2013-04-17 13:50:33 +08:00