73076 Commits

Author SHA1 Message Date
Dan Poltawski
f5c493f75e Merge branch 'MDL-49666' of git://github.com/timhunt/moodle 2015-03-31 19:18:14 +01:00
Tim Hunt
063cbe93e3 MDL-49666 questions: coding style fixes 2015-03-31 15:23:20 +01:00
Tim Hunt
ed98894326 MDL-49666 qbehaviour_informationitem: respect $options->readonly 2015-03-31 15:22:16 +01:00
Dan Poltawski
f0fb1ed518 Merge branch 'MDL-49671-master' of git://github.com/merrill-oakland/moodle 2015-03-31 15:05:37 +01:00
Dan Poltawski
a9feb0c48f Merge branch 'MDL-49595' of https://github.com/rlorenzo/moodle 2015-03-31 14:51:43 +01:00
Rajesh Taneja
d83a1c11a2 MDL-48605 unit_test: Only touch real file/dir 2015-03-31 21:45:23 +08:00
Dan Poltawski
c157a42a7b Merge branch 'MDL-49547' of git://github.com/timhunt/moodle 2015-03-31 14:43:48 +01:00
Dan Poltawski
22a520231d Merge branch 'MDL-49661-master-pluginfotodo' of git://github.com/mudrd8mz/moodle 2015-03-31 14:37:44 +01:00
Dan Poltawski
a80ff5baa2 Merge branch 'MDL-49643-master-local-nav' of git://github.com/mudrd8mz/moodle 2015-03-31 14:28:08 +01:00
Dan Poltawski
6cb65683d1 Merge branch 'MDL-49598-master' of git://github.com/andrewnicols/moodle 2015-03-31 14:21:37 +01:00
Tim Hunt
5e63b335fe MDL-40992 quiz: option to let students redo questions within an attempt
This feature is designed for use on pracice or formative quizzes.
It is available for quizzes that use Interactive or Immediate feedback
behaviour.

If the teacher turns this on in the quiz settings, then once a student
has finished a question, they get a 'Redo question' button beside the
question. If they click it, then the question they finished is replaced
by a new one so they can try again to practise that particul skill or
bit of knowledge a bit more.

When randomisation is involved, the studnets will be given a question or
variant that they have not seen before if possible.
2015-03-31 14:12:48 +01:00
Dan Poltawski
8a39f66130 Merge branch 'MDL-49606-master' of git://github.com/jleyva/moodle 2015-03-31 13:59:05 +01:00
Dan Poltawski
0ec875745a Merge branch 'MDL-49645_master' of git://github.com/markn86/moodle 2015-03-31 13:28:19 +01:00
Dan Poltawski
2a9db845f8 Merge branch 'MDL-49641-get_external_files_master' of https://github.com/jpahullo/moodle 2015-03-31 13:15:06 +01:00
David Mudrák
3e4f5e6591 MDL-47773 comment: Indicate comment being saved via AJAX
This should be considered as quick & dirty usability fix as the whole JS
should ideally be rewritten and this behaviour should use CSS classes.
2015-03-31 13:59:59 +02:00
David Mudrák
0eb1b5fd51 MDL-49730 workshop: Do not waste valuable screen space
Stop using elements with width less than 100% in the workshop UI.
2015-03-31 13:46:32 +02:00
Dan Poltawski
90748dfb52 Merge branch 'MDL-49674-master-commentformat' of git://github.com/mudrd8mz/moodle 2015-03-31 12:16:58 +01:00
Dan Poltawski
deadda2f86 Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle
Conflicts:
	mod/lesson/db/upgrade.php
	mod/lesson/version.php
2015-03-31 11:21:11 +01:00
Dan Poltawski
4e664d1689 Merge branch 'MDL-26689' of git://github.com/jmvedrine/moodle 2015-03-31 10:46:30 +01:00
Dan Poltawski
7d9df98458 Merge branch 'wip-MDL-46960-master' of https://github.com/marinaglancy/moodle 2015-03-31 09:55:08 +01:00
Dan Poltawski
7e5c5b83c1 Merge branch 'm29_MDL-43818_Unable_Download_Package_Via_URL' of https://github.com/scara/moodle 2015-03-31 09:27:46 +01:00
Dan Poltawski
5b73c94858 Merge branch 'MDL-49525-master' of git://github.com/xow/moodle 2015-03-31 09:24:06 +01:00
Dan Poltawski
a7ef012dc4 Merge branch 'wip-mdl-48096' of https://github.com/rajeshtaneja/moodle 2015-03-31 08:57:59 +01:00
Rajesh Taneja
4df12b9372 MDL-48096 scorm: Include section number in cm 2015-03-31 15:51:47 +08:00
David Monllao
58aa74522d Merge branch 'MDL-49696-master' of git://github.com/andrewnicols/moodle 2015-03-31 15:42:11 +08:00
Andrew Nicols
649acb9833 MDL-49696 theme_bootstrapbase: Update thirdpartylibs.xml + readme 2015-03-31 15:33:39 +08:00
David Monllao
4451f89b07 Merge branch 'MDL-44874-master' of git://github.com/andrewnicols/moodle 2015-03-31 15:22:03 +08:00
Andrew Nicols
6efd119da2 Merge branch 'MDL-49695_master' of git://github.com/markn86/moodle 2015-03-31 15:14:45 +08:00
Rajesh Taneja
d421a973d1 MDL-48605 unit_test: Fixed file_temp_cleanup_task
touch should only work on temp and below
dir's. With path we get temp/.. and temp/.
So we were modfying moodledata dir as well
and it was failing because of permission issues.
2015-03-31 14:59:48 +08:00
Andrew Nicols
ea3a71faf7 MDL-49294 logging: Improve cleanup tests 2015-03-31 14:11:25 +08:00
Andrew Nicols
70be2642fc MDL-44874 core: Add per-request directory functions
This adds functionality to create individual request directories which can
be only be used for the current request. They are removed by a shutdown
handler.
2015-03-31 13:58:44 +08:00
Andrew Nicols
78045f6583 Merge branch 'log_cleanup_29' of https://github.com/tlevi/moodle 2015-03-31 12:56:31 +08:00
Andrew Nicols
e2c7ed7459 MDL-49669 badges: Add comment to explain CURLOPT_POSTREDIR 2015-03-31 12:19:12 +08:00
Andrew Nicols
59784e6cdf Merge branch 'MDL-49669_master' of https://github.com/totara/openbadges 2015-03-31 12:12:26 +08:00
Yuliya Bozhko
7e7b5afac6 MDL-48205 badges: Get rid of ucfirst() and make modnames translatable
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-03-31 16:42:55 +13:00
John Okely
c2260adeff MDL-49525 libraries: Update Jquery to 1.11.2 and JQuery UI to 1.11.4 2015-03-31 11:29:37 +08:00
David Monllao
b8842bcdc7 Merge branch 'MDL-49114-master' of git://github.com/lameze/moodle 2015-03-31 11:29:16 +08:00
Marina Glancy
d368ce21ff MDL-46960 badges: optimise interaction with completionlib 2015-03-31 11:06:57 +08:00
Marina Glancy
0cc9d709ab MDL-46960 completionlib: adjustments to caching 2015-03-31 11:06:53 +08:00
David Monllao
bdece5fc27 Merge branch 'MDL-49474' of git://github.com/jmvedrine/moodle 2015-03-31 10:14:45 +08:00
Michael Wheeler
3871db0ac2 MDL-46960 completionlib: Move completion cache to MUC. 2015-03-31 09:31:30 +08:00
David Monllao
b51ff393cd Merge branch 'MDL-6340' of git://github.com/timhunt/moodle 2015-03-31 08:44:01 +08:00
Andrew Nicols
73edc9b12e Merge branch 'master_MDL-46805' of https://github.com/danmarsden/moodle 2015-03-31 08:15:23 +08:00
Eloy Lafuente (stronk7)
02badbb0e6 MDL-32547 unit tests: Make tests match file_temp_cleanup_task impl.
While default value did not change from 7 days... there are subtle
differences between strtotime('-1 week') used in tests and
-(7*24**3600) used in implementation.

This just makes the unit test to follow the implementation by
using the new config setting.
2015-03-31 01:53:56 +02:00
Eloy Lafuente (stronk7)
68632b6d80 MDL-47572 unit tests: make cronlib_testcase DST immune
Disclaimer: I've assigned this commit to MDL-47572 because it's
the issue where I've seen related changes.

Since a couple of days ago, both CI servers were failing. A couple
of days ago it was DST change in Europe/Madrid (that is the PHP
default TZ used by them).

Tests pass perfectly if the TZ is set to any other place not affected
by DST (Australia/Perth, for example).

Really the issue is a wrong mix of functions supporting DST and
functions not supporting them.

But, with current implementation (checking +-60 seconds around a time)
and with a DST change in the middle... this unit tests was going to be
failing for an entire week. And that's not acceptable for CIs.

So, I've changed the intervals, to be bigger than 1h (exactly 1h1s), so
they will be immune to the DST change/partial support.

Ideally all operations should be working in the same way (with or
without DST considered), but that's out from the scope of getting this
test stable enough and passing.
2015-03-31 01:21:18 +02:00
Eloy Lafuente (stronk7)
bdd48b459e MDL-49203 webservices: Increment subsystems count in unit tests. 2015-03-31 00:42:27 +02:00
Dan Marsden
ef88aa2938 MDL-46805 SCORM: AICC restricts allowed characters in the username 2015-03-31 10:38:16 +13:00
Matteo Scaramuccia
97cc12349e MDL-43818 SCORM: unable to download the Package via URL. 2015-03-30 20:37:02 +02:00
Eloy Lafuente (stronk7)
f802e1c2c8 Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle 2015-03-30 20:01:10 +02:00
Dan Poltawski
2b36742f16 Merge branch 'MDL-49528-master' of git://github.com/xow/moodle 2015-03-30 15:04:45 +01:00