Tim Hunt [Mon, 6 Oct 2014 14:44:21 +0000 (15:44 +0100)]
MDL-47547 quiz editing: minor fixes following MDL-47547
* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.
Dan Poltawski [Mon, 6 Oct 2014 13:00:20 +0000 (14:00 +0100)]
Merge branch 'MDL-45504' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 6 Oct 2014 12:53:26 +0000 (13:53 +0100)]
MDL-43089 question: fix shifter build issues
Marina Glancy [Mon, 6 Oct 2014 12:40:13 +0000 (20:40 +0800)]
Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle
Marina Glancy [Mon, 6 Oct 2014 12:39:09 +0000 (20:39 +0800)]
Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 6 Oct 2014 12:38:29 +0000 (20:38 +0800)]
Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 6 Oct 2014 11:56:45 +0000 (12:56 +0100)]
MDL-43089 question: fix whitespace
Dan Poltawski [Mon, 6 Oct 2014 11:49:55 +0000 (12:49 +0100)]
Merge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle
Dan Poltawski [Mon, 6 Oct 2014 11:11:33 +0000 (12:11 +0100)]
Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle
Dan Poltawski [Mon, 6 Oct 2014 07:54:09 +0000 (08:54 +0100)]
Merge branch 'MDL-47426' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 6 Oct 2014 04:31:15 +0000 (17:31 +1300)]
MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant
Eloy Lafuente (stronk7) [Sun, 5 Oct 2014 23:11:41 +0000 (01:11 +0200)]
MDL-45504 environment: define 2.8 requirements
No changes from 2.7, so this is a simple copy of them.
The MyISAM case (MDL-46064) will be considered for 2.9.
Sam Hemelryk [Sun, 5 Oct 2014 22:15:44 +0000 (11:15 +1300)]
Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2
Sam Hemelryk [Sun, 5 Oct 2014 22:10:19 +0000 (11:10 +1300)]
Merge branch 'MDL-43472-master' of git://github.com/danpoltawski/moodle
Tim Hunt [Sun, 5 Oct 2014 21:47:52 +0000 (22:47 +0100)]
MDL-43089 behat: fix core_question tests that use quiz.
Unfortunately, using the quiz is the only way to test this, so no way to break the dependency.
Sam Hemelryk [Sun, 5 Oct 2014 21:44:30 +0000 (10:44 +1300)]
Merge branch 'MDL-45374' of git://github.com/jleyva/moodle
Dan Poltawski [Sun, 28 Sep 2014 14:43:50 +0000 (15:43 +0100)]
MDL-46210 langimport: behat tests
Behat tests for lang import. To run these tests you must define the
TOOL_LANGIMPORT_REMOTE_TESTS constant - because they rely on the
download.moodle.org infrastructure.
Dan Poltawski [Sun, 28 Sep 2014 13:15:41 +0000 (14:15 +0100)]
MDL-46210 langimport: logging for install/update/remove
Now that we have sceduled tasks updating the langpacks, its useful
to log which actions have occured.
Dan Poltawski [Sat, 27 Sep 2014 20:22:57 +0000 (21:22 +0100)]
MDL-47221 task: allow 'random' time definitions
When working against external services it can be advantageous to not
have automated tasks all hit the service at the exact same time from
many different installations.
This change allows the use of 'R' in hour/minute fields of the scheduled
task definition so a task will be installed with a 'random' hour/minute
value for these sort of occasions.
Note that the task will be installed in the database with a defined
time, this simply randomises the time chosen when loading from the
definiton.
Dan Poltawski [Thu, 11 Sep 2014 20:58:13 +0000 (21:58 +0100)]
MDL-46210 langimport: task for updating langpacks
Now langpacks will be updated by scheduled task every day rather
than updating manually.
Dan Poltawski [Thu, 11 Sep 2014 20:28:14 +0000 (21:28 +0100)]
MDL-46210 langimport: Rearrange code
Factoring code into a controller class so that the update
can be put into a scheduled task (and be a bit tider).
Dan Poltawski [Sat, 27 Sep 2014 20:22:57 +0000 (21:22 +0100)]
MDL-47221 task: allow 'random' time definitions
When working against external services it can be advantageous to not
have automated tasks all hit the service at the exact same time from
many different installations.
This change allows the use of 'R' in hour/minute fields of the scheduled
task definition so a task will be installed with a 'random' hour/minute
value for these sort of occasions.
Note that the task will be installed in the database with a defined
time, this simply randomises the time chosen when loading from the
definiton.
Dan Poltawski [Sat, 4 Oct 2014 07:36:04 +0000 (08:36 +0100)]
MDL-43472 course: behat tests for searching courses
Juan Leyva [Wed, 1 Oct 2014 09:19:12 +0000 (11:19 +0200)]
MDL-45374 messages: Bump version number
Juan Leyva [Wed, 1 Oct 2014 09:10:42 +0000 (11:10 +0200)]
MDL-45374 messages: Created new API function message_get_messages
Juan Leyva [Tue, 6 May 2014 16:01:41 +0000 (18:01 +0200)]
MDL-45374 messages: get_messages ws unit tests
Juan Leyva [Mon, 5 May 2014 12:34:17 +0000 (14:34 +0200)]
MDL-45374 messages: get_messages ws definition
Willy Lee [Tue, 30 Sep 2014 21:04:18 +0000 (14:04 -0700)]
MDL-43472 course: Add bulk move to management search page
David Mudrák [Thu, 25 Sep 2014 16:33:05 +0000 (18:33 +0200)]
MDL-44536 workshop: Fix missing phpDoc for user report callbacks
Colin Chambers [Thu, 5 Dec 2013 16:18:24 +0000 (16:18 +0000)]
MDL-43089 quiz: improved interface for building quizzes
This commit is actually the joint work of Mahmoud Kassaei, Colin
Chambers and Tim Hunt from The Open University. We could only use one
persons name for the commit, and this time Colin gets the credit/blame.
The goal of this work was to increase usability, and also clean up
the page enough that it will be possible to add new features in future.
Display of mod/quiz/edit.php is now entirely generated by
mod_quiz\output\edit_renderer. This uses a helper class
mod_quiz\structure to provide details of the structure of the quiz, and
mod_quiz\repaginate to alter that structure. (Acutally, there are still
some modification methods on mod_quiz\structure. Expect that to be
cleaned up in future.)
The new code uses much more ajax, and there are new scripts
mod/quiz/edit_rest.php and mod/quiz/repaginate.php to handle this.
(Again, don't be surprised if those two scripts get merged in future.)
Also questionbank.ajax.php (which may, in future, be made more generic,
and moved into the core question bank code.)
Most of the new JavaScript code has intentionally copied the way things
are done when editing activities on the course page.
As a result of this, mod/quiz/editlib.php is now much shorter than it
was. (In future, expect the remaining code in here to move into
mod/quiz/classes.)
Tim Hunt [Thu, 25 Sep 2014 14:52:00 +0000 (15:52 +0100)]
MDL-47426 assign local roles: rewrite query for better performance.
This is an extremely dangerous query, because it includes the user
table twice, along-side two other potentially large tables,
role_assignments and user_enrolments.
The solution is to rewrite the query so that:
1. The subquery is JOINed, not WHERE ... INed. Typically query
optimisers handle the JOIN case better.
2. Before the join was role-assignments <-> users <-> subquery.
That is, everything was linked to u.id.
Now the linking is role-assignments <-> subquery <-> users,
so the SELECT DISTINT eu1_u.id FROM {enrolled users} is central.
That seems to send a strong hint to the query optimiser about
a good order to execute the query.
Dan Poltawski [Thu, 2 Oct 2014 14:18:52 +0000 (15:18 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 2 Oct 2014 14:18:51 +0000 (15:18 +0100)]
NOBUG: Fixed file access permissions
Dan Poltawski [Thu, 2 Oct 2014 14:18:48 +0000 (15:18 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 2 Oct 2014 08:48:25 +0000 (09:48 +0100)]
Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Thu, 2 Oct 2014 08:35:30 +0000 (09:35 +0100)]
Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle
Dan Poltawski [Thu, 2 Oct 2014 08:09:16 +0000 (09:09 +0100)]
Revert "MDL-32870 mod_lesson: added support for files to question answers and responses"
This reverts commit
d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
Sam Hemelryk [Thu, 2 Oct 2014 04:39:49 +0000 (17:39 +1300)]
Revert "MDL-47395 added cli_error() visual cue"
This reverts commit
eb60c78c771ee4acbfe3667a3cc44c2df61e1def.
Sam Hemelryk [Thu, 2 Oct 2014 04:30:47 +0000 (17:30 +1300)]
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
Dmitry Nefedov [Wed, 1 Oct 2014 08:53:31 +0000 (16:53 +0800)]
MDL-47408 user: Add checking before adding blog's link.
Checking enableblogs and bloglevel, userid, constant BLOG_USER_LEVEL.
Andrew Nicols [Thu, 2 Oct 2014 03:50:15 +0000 (11:50 +0800)]
MDL-46282 core: Correct deletion of message datakeys
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Dan Poltawski [Wed, 1 Oct 2014 07:48:10 +0000 (08:48 +0100)]
Revert "MDL-45893 user_menu: revised based on action_menu"
Was not yet ready for the prime time.
This reverts commit
dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit
a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit
c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit
d24b8e52d38526bf62612c3569db1d3174613c77.
Conflicts:
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 1 Oct 2014 07:37:43 +0000 (08:37 +0100)]
Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle
Andrew Nicols [Wed, 1 Oct 2014 07:27:35 +0000 (15:27 +0800)]
MDL-47214 core: IPs should be cleaned
Frederic Massart [Wed, 1 Oct 2014 03:23:46 +0000 (11:23 +0800)]
MDL-37707 mod_assign: Prevent user from changing grouping in team submissions
Sam Hemelryk [Wed, 1 Oct 2014 02:37:56 +0000 (15:37 +1300)]
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
Dan Marsden [Wed, 1 Oct 2014 02:04:55 +0000 (15:04 +1300)]
MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.
Eloy Lafuente (stronk7) [Tue, 30 Sep 2014 21:42:58 +0000 (23:42 +0200)]
Merge branch '47428-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 30 Sep 2014 19:57:37 +0000 (08:57 +1300)]
Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle
Conflicts:
version.php
zbdd [Fri, 29 Aug 2014 02:19:37 +0000 (02:19 +0000)]
MDL-42993 auth: spaces removed from usernames by default only
Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.
Also included 2 trim statements where small issues were found with reading
external usernames in that were not filtered for trailing whitespaces.
Dan Poltawski [Tue, 30 Sep 2014 16:30:20 +0000 (17:30 +0100)]
Merge branch 'MDL-46171-master-fix1' of github.com/damyon/moodle
Damyon Wiese [Tue, 30 Sep 2014 15:35:37 +0000 (23:35 +0800)]
MDL-46171 dml: DML unit test for tricky SQL in assign upgrade
This tests a workaround for set_field_select where the set table and from table are the same.
Dan Poltawski [Tue, 30 Sep 2014 15:02:09 +0000 (16:02 +0100)]
Merge branch 'MDL-46171-master-fix1' of github.com/damyon/moodle
Dan Poltawski [Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)]
Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
Jetha Chan [Tue, 30 Sep 2014 13:15:44 +0000 (21:15 +0800)]
MDL-45893 user_menu: fix to hide user_pictures from screen readers
Damyon Wiese [Tue, 30 Sep 2014 13:16:24 +0000 (21:16 +0800)]
MDL-46171 assign: Fix for the update script on MySQL.
Dan Poltawski [Tue, 30 Sep 2014 13:04:24 +0000 (14:04 +0100)]
Merge branch '3034-28' of https://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 30 Sep 2014 12:53:09 +0000 (13:53 +0100)]
MDL-45893 behat: quick fix for usermenu logout button
(This needs revisiting properly - I am not an xpath expert)
Dan Poltawski [Tue, 30 Sep 2014 10:41:37 +0000 (11:41 +0100)]
Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle
Dan Poltawski [Tue, 30 Sep 2014 10:38:17 +0000 (11:38 +0100)]
MDL-47195 force an upgrade for classloader changes
Dan Poltawski [Tue, 30 Sep 2014 10:07:23 +0000 (11:07 +0100)]
Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 30 Sep 2014 08:55:03 +0000 (09:55 +0100)]
Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 30 Sep 2014 07:47:31 +0000 (08:47 +0100)]
Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)]
Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Dan Poltawski [Tue, 30 Sep 2014 07:30:59 +0000 (08:30 +0100)]
Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)]
Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:03:40 +0000 (08:03 +0100)]
Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 9 Jul 2014 05:22:36 +0000 (13:22 +0800)]
MDL-46282 core: Add VERP API
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Sam Hemelryk [Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)]
Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)]
Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:25:23 +0000 (10:25 +1300)]
MDL-45893 user: fixed user menu for guest
Sam Hemelryk [Mon, 29 Sep 2014 21:03:06 +0000 (10:03 +1300)]
Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 29 Sep 2014 20:54:08 +0000 (09:54 +1300)]
MDL-46652 output: more thorough custom menu multilang tests
Sam Hemelryk [Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)]
Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 29 Sep 2014 19:48:20 +0000 (08:48 +1300)]
Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle
Dan Poltawski [Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)]
Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:46:11 +0000 (12:46 +0100)]
Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:29:59 +0000 (12:29 +0100)]
Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:04:01 +0000 (12:04 +0100)]
Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)]
Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:12:29 +0000 (11:12 +0100)]
Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:42:50 +0000 (10:42 +0100)]
Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:30:42 +0000 (10:30 +0100)]
Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)]
Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 29 Sep 2014 02:17:24 +0000 (15:17 +1300)]
Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 29 Sep 2014 02:15:47 +0000 (15:15 +1300)]
Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:35:06 +0000 (14:35 +1300)]
Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:32:38 +0000 (14:32 +1300)]
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:23:18 +0000 (14:23 +1300)]
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:21:39 +0000 (14:21 +1300)]
Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:19:52 +0000 (14:19 +1300)]
Merge branch 'MDL-39190' of https://github.com/pauln/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:00:42 +0000 (14:00 +1300)]
Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 23:42:32 +0000 (01:42 +0200)]
Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:35:23 +0000 (11:35 +1300)]
Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:21:19 +0000 (11:21 +1300)]
Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:19:06 +0000 (11:19 +1300)]
Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle
Jean-Michel Vedrine [Sun, 17 Mar 2013 22:40:40 +0000 (23:40 +0100)]
MDL-32870 mod_lesson: added support for files to question answers and responses
Brian Barnes [Wed, 25 Jun 2014 04:33:12 +0000 (16:33 +1200)]
MDL-46127 core_calendar: Removed tables when rendering a single event
Sam Hemelryk [Sun, 28 Sep 2014 20:51:35 +0000 (09:51 +1300)]
Merge branch 'MDL-43566' of https://github.com/willylee/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:11:25 +0000 (09:11 +1300)]
Merge branch 'MDL-47395' of git://github.com/nebgor/moodle