69968 Commits

Author SHA1 Message Date
Tim Hunt
4d1fcfdf8a 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.
2014-10-06 15:44:21 +01:00
Dan Poltawski
9c054ebbe3 Merge branch 'MDL-45504' of git://github.com/stronk7/moodle 2014-10-06 14:00:20 +01:00
Dan Poltawski
816d082241 MDL-43089 question: fix shifter build issues 2014-10-06 13:53:26 +01:00
Marina Glancy
b79d2e2c08 Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle 2014-10-06 20:40:13 +08:00
Marina Glancy
2891651959 Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:39:09 +08:00
Marina Glancy
e286185334 Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle 2014-10-06 20:38:29 +08:00
Dan Poltawski
0892a5d65f MDL-43089 question: fix whitespace 2014-10-06 12:56:45 +01:00
Dan Poltawski
84f9d6f3df Merge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle 2014-10-06 12:49:55 +01:00
Dan Poltawski
2eb24eb85a Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle 2014-10-06 12:11:33 +01:00
Dan Poltawski
d79fd5cd29 Merge branch 'MDL-47426' of git://github.com/timhunt/moodle 2014-10-06 08:54:09 +01:00
Petr Skoda
ddffa9d6d3 MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant 2014-10-06 17:31:15 +13:00
Eloy Lafuente (stronk7)
2b9c1cc5a4 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.
2014-10-06 01:11:41 +02:00
Sam Hemelryk
7b08f6e888 Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2 2014-10-06 11:15:44 +13:00
Sam Hemelryk
79eefed3c8 Merge branch 'MDL-43472-master' of git://github.com/danpoltawski/moodle 2014-10-06 11:10:19 +13:00
Tim Hunt
2dee2330aa 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.
2014-10-05 22:47:52 +01:00
Sam Hemelryk
127ef54082 Merge branch 'MDL-45374' of git://github.com/jleyva/moodle 2014-10-06 10:44:30 +13:00
Dan Poltawski
49bee6dc67 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.
2014-10-05 14:40:47 +01:00
Dan Poltawski
ed914e31c5 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.
2014-10-05 14:34:38 +01:00
Dan Poltawski
16078807f8 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.
2014-10-05 14:27:04 +01:00
Dan Poltawski
1028f6fab8 MDL-46210 langimport: task for updating langpacks
Now langpacks will be updated by scheduled task every day rather
than updating manually.
2014-10-05 14:25:45 +01:00
Dan Poltawski
816b3e0176 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).
2014-10-05 14:25:45 +01:00
Dan Poltawski
516ea6cf8b 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.
2014-10-05 14:25:44 +01:00
Dan Poltawski
06b5e81bcd MDL-43472 course: behat tests for searching courses 2014-10-04 08:40:32 +01:00
Juan Leyva
ffb8abc290 MDL-45374 messages: Bump version number 2014-10-03 16:37:52 +02:00
Juan Leyva
193edf7f77 MDL-45374 messages: Created new API function message_get_messages 2014-10-03 16:37:13 +02:00
Juan Leyva
6ff4464b43 MDL-45374 messages: get_messages ws unit tests 2014-10-03 16:37:13 +02:00
Juan Leyva
aff9da176a MDL-45374 messages: get_messages ws definition 2014-10-03 16:37:12 +02:00
Willy Lee
fe3999eca2 MDL-43472 course: Add bulk move to management search page 2014-10-03 06:46:18 -07:00
David Mudrák
5c29cc6e85 MDL-44536 workshop: Fix missing phpDoc for user report callbacks 2014-10-03 09:56:46 +02:00
Colin Chambers
e1a2d0d92d 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.)
2014-10-02 17:22:23 +01:00
Tim Hunt
482ca72089 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.
2014-10-02 17:10:40 +01:00
Dan Poltawski
6597413d41 weekly release 2.8dev 2014-10-02 15:18:52 +01:00
Dan Poltawski
9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Dan Poltawski
356e857bbb Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-02 15:18:48 +01:00
Dan Poltawski
7e704313d2 Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle 2014-10-02 09:48:25 +01:00
Dan Poltawski
2e8101f6e6 Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle 2014-10-02 09:35:30 +01:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses"
This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
2014-10-02 09:09:16 +01:00
Sam Hemelryk
454034351b Revert "MDL-47395 added cli_error() visual cue"
This reverts commit eb60c78c771ee4acbfe3667a3cc44c2df61e1def.
2014-10-02 17:39:49 +13:00
Sam Hemelryk
251089fe44 Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle 2014-10-02 17:30:47 +13:00
Dmitry Nefedov
66b864c797 MDL-47408 user: Add checking before adding blog's link.
Checking enableblogs  and bloglevel, userid, constant  BLOG_USER_LEVEL.
2014-10-02 12:17:14 +08:00
Andrew Nicols
390485058e 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.
2014-10-02 11:50:34 +08:00
Dan Poltawski
76e348d46d 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
2014-10-01 08:58:22 +01:00
Dan Poltawski
f2a8ecfae9 Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle 2014-10-01 08:37:43 +01:00
Andrew Nicols
84b02e6efd MDL-47214 core: IPs should be cleaned 2014-10-01 15:27:53 +08:00
Frederic Massart
6849d15df5 MDL-37707 mod_assign: Prevent user from changing grouping in team submissions 2014-10-01 11:27:44 +08:00
Sam Hemelryk
db89450d85 Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-10-01 15:37:56 +13:00
Dan Marsden
9528f643d1 MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.
2014-10-01 15:05:56 +13:00
Eloy Lafuente (stronk7)
ed3e85755c Merge branch '47428-28' of git://github.com/samhemelryk/moodle 2014-09-30 23:42:58 +02:00
Sam Hemelryk
db34f8cbdb Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle
Conflicts:
	version.php
2014-10-01 08:57:37 +13:00
zbdd
77218e4a52 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.
2014-10-01 08:24:54 +13:00