Commit graph

14928 commits

Author SHA1 Message Date
Rajesh Taneja
e63515ba93 MDL-31405 Assignment: Fixed date in reset to be called for every assignment 2013-10-14 12:34:55 +08:00
Dan Poltawski
b1bdb61e90 Merge branch 'MDL-42167-workshop-update-record' of git://github.com/mudrd8mz/moodle 2013-10-14 12:07:54 +08:00
Marina Glancy
4ff520d800 MDL-42288 behat: Allowing to change choice response
Automate MDLQA-46 - A teacher can choose whether to allow students to change their choice response
2013-10-14 10:46:24 +11:00
Eloy Lafuente (stronk7)
7d766e4ca1 Merge branch 'wip-mdl-41843' of git://github.com/rajeshtaneja/moodle 2013-10-14 00:13:26 +02:00
Andrew Nicols
ee4ece6822 MDL-29441 Chat: Use a valid name for chat popup actions 2013-10-12 00:53:48 +08:00
Tim Hunt
d3603928a9 MDL-42230 fix inconsistent quiz lang string.
This matches a change made to another string in MDL-32188.
2013-10-11 14:32:24 +01:00
Marina Glancy
1b7930fe4a Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle 2013-10-11 13:32:14 +11:00
Matteo Scaramuccia
996531e7f1 MDL-42167 Update workshop assessment record only when really changed
Under certain conditions there is nothing to actually update here. The
$DB->update_record() would throw an exception here.
2013-10-10 10:07:53 +02:00
Adrian Greeve
6d3d9bd927 MDL-42238 - mod_wiki: Alternate name sql update to wiki_print_recent_activity 2013-10-10 14:02:32 +08:00
Adrian Greeve
dda60f88cd MDL-42238 - mod_forum: Alternate name sql update to forum_print_recent_activity. 2013-10-10 14:02:23 +08:00
Dan Poltawski
9092378ddb MDL-42240 assignfeedback_editpdf: improve ghostscript debugging 2013-10-10 13:55:46 +08:00
Marina Glancy
0965a9be10 Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle 2013-10-10 12:52:28 +11:00
Marina Glancy
9c5d6183d5 Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle 2013-10-10 11:12:35 +11:00
Dan Poltawski
f57053fc2a Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle 2013-10-09 17:23:44 +08:00
Rajesh Taneja
9dbe0313ce MDL-42222 Assignment: Added type check before checking mimetype
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
2013-10-09 16:53:46 +08:00
Damyon Wiese
604fc45ee0 Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle 2013-10-09 11:48:14 +08:00
Ankit Agarwal
136f4c47b3 MDL-40046 events: Use correct variable for page instance id 2013-10-09 11:20:32 +08:00
Sam Hemelryk
f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-09 15:58:45 +13:00
Paul Nicholls
0d64c75fb2 MDL-37153 - assign: Obey grade display settings in submission status
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
2013-10-09 15:56:52 +13:00
Damyon Wiese
869dd1fc6c Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle 2013-10-09 09:39:09 +08:00
Eloy Lafuente (stronk7)
8fe9bbde09 Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle 2013-10-09 01:29:17 +02:00
Eloy Lafuente (stronk7)
7d19bc1353 Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle 2013-10-08 21:25:46 +02:00
Charles Fulton
3ed2c6e50c MDL-34612 forum: convert default format value during restore 2013-10-08 09:56:04 -07:00
Charles Fulton
68e0759c94 MDL-34586 assignment: convert default format value during restore 2013-10-08 09:45:52 -07:00
Eric Merrill
bd8f5d459d MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED
Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.

FORUM_TRACKING_ON retained but marked depreciated.
2013-10-08 08:04:55 -04:00
Eric Merrill
20e6782f10 MDL-29663 forum: Option to allow Forced for read tracking.
Converts the use of Read Tracking On to Forced. Adds new admin setting
forum_allowforcedreadtracking. If set, Forced will be available when
adding or editing forums. In this state the forced forum overrides the
user preference of off.

With forum_allowforcedreadtracking not set (default) behavior is the
same as now, except forums previously set in the On state are treated
as Optional.

The side effect of forum_allowforcedreadtracking being on, is that users
cannot speed up the loading of course pages with lots of forums by
setting their personal forum read tracking option to off.
2013-10-08 08:03:54 -04:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 16:42:17 +08:00
Damyon Wiese
6abc173877 Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle 2013-10-08 14:43:14 +08:00
Dan Poltawski
bcb3c375e3 Merge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle 2013-10-08 14:33:27 +08:00
Frederic Massart
7f6e3eefd1 MDL-40060 mod_book: Replace add_to_log with events 2013-10-08 14:11:10 +08:00
Dan Poltawski
fa96fb0cea Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle 2013-10-08 13:33:25 +08:00
Dan Poltawski
8431c290fd Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle 2013-10-08 13:25:12 +08:00
Rajesh Taneja
3f8ccd7c5f MDL-41843 IMS-LTI: Fixed exception namespace 2013-10-08 13:24:34 +08:00
Dan Poltawski
6cd7df4df1 Merge branch 'MDL-38655' of git://github.com/aolley/moodle 2013-10-08 13:21:30 +08:00
Dongsheng Cai
b56d1ecadb MDL-41843 Uses OAuthException in moodle\mod\lti namespace 2013-10-08 13:18:00 +08:00
Damyon Wiese
944cfe1dec Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle 2013-10-08 12:45:43 +08:00
Sam Hemelryk
ff8e257867 Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:04:05 +13:00
Sam Hemelryk
cbf34f34cc Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
Conflicts:
	lib/db/upgrade.php
2013-10-08 14:43:36 +13:00
Marina Glancy
04a4de20e8 Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle 2013-10-08 12:03:15 +11:00
Sam Hemelryk
87f28ddceb Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle 2013-10-08 11:20:51 +13:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
2013-10-07 13:10:36 +02:00
Jerome Mouneyrac
673c4ffe60 MDL-42030 EditPDF: when selecting stamp image the stamp tool is not selected 2013-10-07 12:13:08 +08:00
Dan Poltawski
d1050e406f Merge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle 2013-10-07 11:26:37 +08:00
Adrian Greeve
94b1577a5a MDL-42098 - mod_forum: Update webservice sql query to include all name fields. 2013-10-07 10:02:44 +08:00
Marina Glancy
2a68ee0eb1 MDL-42016 files: Properly synchronise internal references 2013-10-06 18:05:05 +11:00
Tim Hunt
e74aa0aa97 MDL-32188 question CBM: compute summary stats for CBM behaviours
We now compute the average CBM score, accuracy, CBM bonus and enhanced
accuracy, both for the entire quiz, and for just the questions answered.

Note that these calculations must work correctly in the presence of
descriptions, ungraded questions, and manually graded questions. For
example, imagine a essay added at the end of the quiz "Summarise what
you learned attempting this exercise." This might have max mark zero or
non-zero. The CBM statistics just ignores questions like that.
2013-10-04 17:56:36 +01:00
Tim Hunt
474aa125ca MDL-32188 quiz/question: behaviours can add to the review summary.
At the top of the quiz reivew page, there is a table that summarises
infomration about the quiz attempt as a whole. For some question
behaviours, we would like to be able to add additional information to
that summary.

This commit introduces a generic method for the behaviour to provide
summary information about an entire question usage.
2013-10-04 17:52:16 +01:00
Joshua Johnston
4938777ed3 MDL-41520 LTI: Does not track page views for completion
Add the missing code for completion_info::set_module_viewed() since LTI
says that it offers completion tracking on view
2013-10-04 09:42:19 -04:00
Fred Woolard
a41945ea74 MDL-42069 mod_quiz add lastname sort for manual grading 2013-10-04 09:05:02 -04:00
Tim Hunt
f3460297a9 MDL-32188 question engine: behaviour static methods -> new classes
It was always a bit of a hack to use static methods on the
qbehaviour_whatever classes to return metadata about the behaviour. It
is better design to have real qbehaviour_whatever_type classes to report
that metadata, particularly now that we are planning to add more such.

For example, inheritance works better with real classes. See, for
example, the improvements in
question_engine::get_behaviour_unused_display_options().

This change has been implemented in a backwards-compatbile way. Old
behaviours will continue to work. There will just be some developer debug
output to prompt people to upgrade their code properly.
2013-10-04 12:15:01 +01:00