70082 Commits

Author SHA1 Message Date
Marina Glancy
4e45c0319c MDL-31936 workshop: version bump 2014-10-07 10:15:54 +08:00
Marina Glancy
ae66542027 Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle 2014-10-07 10:08:48 +08:00
Sam Hemelryk
3ba4e595fb Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle 2014-10-07 10:36:48 +13:00
David Mudrák
16d364b560 MDL-31936 workshop: Improve unit tests for the course reset support 2014-10-06 23:32:32 +02:00
Sam Hemelryk
f46606936a Merge branch 'MDL-46978' of https://github.com/danielneis/moodle 2014-10-07 10:26:05 +13:00
Dan Poltawski
15b57a34df MDL-46576 grade: fix trailing whitespace 2014-10-06 18:11:25 +01:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9 Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle 2014-10-06 16:01:26 +01:00
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
Adrian Greeve
102c1c3671 MDL-46576 core_grades: Update upgrade scripts new version number 2014-10-03 17:06:42 +08:00
Marina Glancy
d75a2367c3 MDL-47520 core_grades: added CSS classes to the setup page
Part of: MDL-46576
2014-10-03 17:06:41 +08:00
Damyon Wiese
a9937aec06 MDL-47062 Grades: Add an upgrade step to warn about changes in upgrade.
Puts a notice on the grader report about the change in aggregation method
from "Sum of grades" to "Natural".

Part of: MDL-46576
2014-10-03 17:06:41 +08:00
David Mudrák
6073131713 MDL-31936 workshop: Generator able to create submissions and assessments
This is a basic implementation of the actual content generation in the workshop
generator. Note the we do not generate actual grading form data (which is what
the grading strategy plugins would do), just their results.
2014-10-03 10:49:06 +02:00
David Mudrák
f2639dca1d MDL-31936 workshop: Add more options to the course reset form
This is built upon original work by Michael Hughes. We now have separate
settings for deleting workshop submissions, assessments and for resetting the
workshop phase.
2014-10-03 10:48:38 +02:00
David Mudrák
4a44c660e5 MDL-31936 workshop: Delete attachments on record removal
The methods workshop::delete_submission() and workshop::delete_assessment() did
not delete files (embedded and attachments) associated with the given
submission or assessment. This is fixed now.

Additionally, the delete_assessment() method now cleans-up records from the
table workshop_grades, too. This internal workshop API still does not give
workshop subplugins a chance to clean up their data, should they store them in
their own tables instead of the workshop_grades one. This should be improved in
the future yet.
2014-10-03 10:47:19 +02:00
David Mudrák
84f8b00166 MDL-31936 workshop: Fix overall feedback content processing order
This is unrelated to the issue but was spotted while testing it. The order of
format_text() and file_rewrite_pluginfile_urls() was incorrect and threw
debugging message. Fixed now.
2014-10-03 10:46:32 +02:00
David Mudrák
e04a0f6b34 MDL-31936 course: Add missing file level docblock to the reset_form.php
Not related to the issue itself but spotted while working on the
workshop reset feature.  Assigning copyleft holder to Petr as the
original author of the file.
2014-10-03 10:45:23 +02:00
Michael Hughes
9c3b03f415 MDL-31936 workshop: Add unit tests for the workshop reset 2014-10-03 10:45:06 +02:00
Michael Hughes
6f760e0107 MDL-31936 workshop: Initial implementation of the course reset support 2014-10-03 10:44:40 +02:00
David Mudrák
5c29cc6e85 MDL-44536 workshop: Fix missing phpDoc for user report callbacks 2014-10-03 09:56:46 +02:00
Marina Glancy
837b92897d MDL-47430 core_grades: rename strings in Behat tests 2014-10-03 13:55:25 +08:00
Marina Glancy
ebfcb9eb90 MDL-47492 core_grades: Behat test for using scales and mingrade in gradebook 2014-10-03 13:55:25 +08:00
Marina Glancy
97329f1bc1 MDL-47492 behat: refer to table column indexes instead of names 2014-10-03 13:55:25 +08:00