Commit graph

55635 commits

Author SHA1 Message Date
Sam Hemelryk
97918ad586 Merge branch 'MDL-34370_master' of git://github.com/lazydaisy/moodle 2012-07-23 12:40:08 +12:00
Sam Hemelryk
dedf660f86 Merge branch 'wip-MDL-34428-master' of git://github.com/marinaglancy/moodle 2012-07-23 12:37:40 +12:00
Sam Hemelryk
a7b2d08727 Merge branch 'MDL-33560-master' of git://github.com/FMCorz/moodle 2012-07-23 12:25:31 +12:00
Jean-Philippe Gaudreau
dacd5daa7a MDL-31516 Fixing grade_edit_tree::format_number 2012-07-23 12:21:50 +12:00
Sam Hemelryk
fc994304a2 Merge branch 'wip-MDL-34221-master' of git://github.com/marinaglancy/moodle 2012-07-23 12:08:15 +12:00
Sam Hemelryk
87608b34f4 Merge branch 'MDL-33927_enforce_max_attachments' of git://github.com/davosmith/moodle 2012-07-23 12:00:30 +12:00
Sam Hemelryk
6d8b85ff82 Merge branch 'MDL-29563_master' of https://github.com/dmonllao/moodle 2012-07-23 11:49:57 +12:00
Jason Ilicic
e0e903291a MDL-34427: Corrected language string when not allowed to enter the chat room. 2012-07-23 11:40:37 +12:00
Sam Hemelryk
f49eff005e Merge branch 'master_MDL-34374' of git://github.com/danmarsden/moodle 2012-07-23 11:38:19 +12:00
Sam Hemelryk
ce4182a46a Merge branch 'master_MDL-34233' of git://github.com/danmarsden/moodle 2012-07-23 11:26:59 +12:00
Sam Hemelryk
c41e682c27 Merge branch 'MDL-34313' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:22:17 +12:00
Sam Hemelryk
1d434a6d17 Merge branch 'MDL-34272' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:20:28 +12:00
Sam Hemelryk
5b2b9e04ef Merge branch 'MDL-34256' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:09:28 +12:00
Sam Hemelryk
d817a9e52e Merge branch 'MDL-34067' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:07:30 +12:00
Sam Hemelryk
f3a6fa396e Merge branch 'MDL-2283' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 10:54:55 +12:00
Sam Hemelryk
30a47aea87 Merge branch 'MDL-34265-master' of git://github.com/ankitagarwal/moodle 2012-07-23 10:39:56 +12:00
Sam Hemelryk
d9416fba03 Merge branch 'MDL-34322-master-1' of git://git.luns.net.uk/moodle 2012-07-23 09:43:17 +12:00
Sam Hemelryk
9df815068c MDL-34243 completion: Fixed up call to completion_criteria::factory that was passing object 2012-07-23 09:38:28 +12:00
Sam Hemelryk
8afee51adb Merge branch 'MDL-34243' of git://github.com/srynot4sale/moodle 2012-07-23 09:37:29 +12:00
Petr Škoda
9e8b02e658 MDL-34441 bump up version to trigger cache purging 2012-07-22 21:01:31 +02:00
Petr Škoda
65ee48679b MDL-34441 add CLI database migration script 2012-07-22 20:56:22 +02:00
Mary Evans
1febf3b138 MDL-34370 theme_fusion: added CSS in style/core.css to enable weeks to be moved when editing 2012-07-22 17:55:59 +01:00
Eric Merrill
478067dbfb MDL-34451 quiz Fixed problem where attempt page is updated for ALL attempts, not just current. 2012-07-22 12:22:28 -04:00
Petr Škoda
6ceaf9807c MDL-34441 add maintenance mode to db migration and improve lang strings 2012-07-22 17:50:45 +02:00
Petr Škoda
b43bc95104 MDL-34441 scroll to the bottom when db migration finished 2012-07-22 15:38:03 +02:00
Petr Škoda
f3ae983eea MDL-34441 rewrite log display actions after db migration 2012-07-22 15:38:03 +02:00
Petr Škoda
3ce26ee7f4 MDL-34441 improve error handling when migrating databases 2012-07-22 15:38:03 +02:00
Petr Škoda
a197c413c5 MDL-34441 prevent mysqli::close() notice after failed mysql driver connect 2012-07-22 15:38:03 +02:00
Petr Škoda
90ad9a5329 MDL-34441 show db transfer in experimental section
DB export and import is not ready yet, sorry.
2012-07-22 15:38:03 +02:00
Petr Škoda
867effce93 MDL-34441 fix switched lang strings 2012-07-22 15:38:02 +02:00
Petr Škoda
ba9703d14f MDL-34441 always use proper charset in htmlspecialchars() calls 2012-07-22 15:38:02 +02:00
Petr Škoda
5a773597de MDL-34441 cleanup dtl related phpdocs and minor style improvements 2012-07-22 15:38:02 +02:00
Petr Škoda
e9324a2274 MDL-34449 lazy load theme layout otpions
This should allow us to switch page layout on admin pages and elsewhere before $OUTPUT->header() call.
2012-07-22 15:33:30 +02:00
Petr Škoda
cb76fec0b5 MDL-34129 show course info on enrolment page 2012-07-21 21:29:58 +02:00
Luke Tucker
8bc4a6528f MDL-34396 Ensure TinyMCE editor spell checking works on pages with $PAGE->https_required() 2012-07-21 20:29:20 +02:00
Petr Škoda
13725b3797 MDL-34299 remove xmlstrictheaders setting and switch to html5 doctype by default
This fixes WCAG 2.0 compliance because we were already using HTML5 markup.

The strict XML headers setting never worked for production servers, developers
used browser validators for compliance testing. XHTML 5 option is relatively
similar to this obsolete option, but still it can not be used on production servers.

XHTML Strict 1.x was a standardised dead end, HTML5 is the new de-facto-standard
supported by all major browsers including latest versions of IE.

Please note nothing changes in our coding style because HTML5 is a superset of
several previous standards, it is recommended to use only features that are
already implemented in all our supported browsers.
2012-07-21 19:23:44 +02:00
Petr Škoda
c8b3346cfd MDL-33180 delete the last traces of SimpleTest - ciao and thanks 2012-07-21 10:11:50 +02:00
Mary Evans
4470ad0950 MDL-34412 theme_afterburner: defined #EEE as background-color in afterburner_styles.css for filemanager and filepicker input, select, button & textarea 2012-07-20 23:12:06 +01:00
David Monllao
8fea05bfb4 MDL-33537 gradingform_rubric Adding the definition when retrieving grading instances
Credit to Sam Chaffee
2012-07-20 14:57:34 +08:00
Marina Glancy
c4b64a064a MDL-34428 Private files repository should have a 'manage' link 2012-07-20 13:32:47 +08:00
Marina Glancy
c81f332876 MDL-34221 disabledIf support for filemanager and filepicker elements 2012-07-20 10:49:30 +08:00
Davo Smith
b1c669a711 MDL-34221 Filepicker - disableIf now prevents drag and drop upload 2012-07-20 10:49:30 +08:00
Frederic Massart
6aa3aabe95 MDL-33560 Enrol: Enrol password can be unmasked 2012-07-20 09:00:39 +08:00
Tim Hunt
c33d527833 MDL-34351 quiz cron: one broken overdue attempt should not kill cron
It seems that sometimes trying to process an overdue quiz attempt can
throw an exception. In that case, we need to catch it and report it
nicely, and then carry on processing the rest of the attempts, rather
than just killing the whole of cron processing.

Also, there may be garbage quiz attempts where the associated quiz or
course has been deleted. Skip those too.
2012-07-19 15:21:05 +01:00
Tim Hunt
7326b7e247 MDL-34379 quiz reports: timetaken 'open' for never submitted attempts 2012-07-19 12:51:55 +01:00
Tim Hunt
dd7aa58386 MDL-34251 question engine: possible infinite loop loading usages
In the case where either a question_attempt had not steps, or a
question_usage had not question_attempts, the load_from_records methods
could get stuck in an infinite loop.

This fix ensures that does not happen, with unit tests to verify it. At
the same time, I noticed an error in the existing tests, which this
patch fixes.
2012-07-19 12:51:00 +01:00
Tim Hunt
be1d8ed194 MDL-34226 multianswer qtype: basic unit test.
This verifies the previous fix, and gets rid of a rather embarassing TODO.
2012-07-19 12:50:47 +01:00
Tim Hunt
c0a912e5ac MDL-34226 multichoice qtype: correct is_complete_response for multianswer
The multianswer qtype uses the multi-choice one, and the way it does its
responses array breaks an assumption that multi-choice was making.
2012-07-19 12:50:47 +01:00
Tim Hunt
a3e6ad77d2 MDL-34066 adaptive behaviour: refactor logic out of renderer.
These changes move the logic to the behaviour class, which is how things
should be.

It also makes it easier to re-use the code that displays the messages
like "Marks for this submission: 1.00/1.00. Accounting for previous
tries, this gives 0.33/1.00." in other places.

To try to make it clearer what is going on, I introduced a new class
qbehaviour_adaptive_mark_details to hold and document the data that the
behaviour needs to return, and the renderer can base its display on.

As far as my testing can tell (and there are new unit tests), this
commit does not change the existing behaviour.

This commit also replaces all the string concatenation that is going on,
which should help translators. At the moment, a few of the old strings
are still in the language file, and are used in the unit tests to verify
that the behaviour has not changed.

Thanks to Oleg Sychev for making a helpful suggestion about the API.
2012-07-19 12:50:17 +01:00
Andrew Davis
77d187ed1e MDL-28568 message: added a warning message when the user is about to message someone who cant reply 2012-07-19 17:14:50 +08:00