Sam Hemelryk [Tue, 7 Oct 2014 20:39:44 +0000 (09:39 +1300)]
MDL-3714 mod_forum: pre-integration clean up
Sam Hemelryk [Tue, 7 Oct 2014 20:39:01 +0000 (09:39 +1300)]
Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 Oct 2014 15:52:07 +0000 (16:52 +0100)]
Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Jetha Chan [Fri, 3 Oct 2014 09:02:02 +0000 (17:02 +0800)]
MDL-45893 user_menu: responsive approach; fixed minor issues
Dan Poltawski [Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)]
Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle
Dan Poltawski [Tue, 7 Oct 2014 13:25:06 +0000 (14:25 +0100)]
Merge branch '46481-28' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 7 Oct 2014 09:16:56 +0000 (17:16 +0800)]
Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 7 Oct 2014 08:24:39 +0000 (09:24 +0100)]
Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 7 Oct 2014 04:34:34 +0000 (12:34 +0800)]
Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Sam Hemelryk [Tue, 7 Oct 2014 03:28:50 +0000 (16:28 +1300)]
Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Marina Glancy [Tue, 7 Oct 2014 02:25:29 +0000 (10:25 +0800)]
Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 7 Oct 2014 02:16:54 +0000 (15:16 +1300)]
Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 7 Oct 2014 02:15:54 +0000 (10:15 +0800)]
MDL-31936 workshop: version bump
Marina Glancy [Tue, 7 Oct 2014 02:08:48 +0000 (10:08 +0800)]
Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Wed, 16 Jul 2014 06:52:02 +0000 (14:52 +0800)]
MDL-3714 mod_forum: Add an inbound message handler
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Andrew Nicols [Wed, 16 Jul 2014 06:51:19 +0000 (14:51 +0800)]
MDL-46284 core: Add e-mail fetcher from IMAP
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Sam Hemelryk [Mon, 6 Oct 2014 21:36:48 +0000 (10:36 +1300)]
Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle
David Mudrák [Thu, 18 Sep 2014 11:52:47 +0000 (13:52 +0200)]
MDL-31936 workshop: Improve unit tests for the course reset support
Sam Hemelryk [Mon, 6 Oct 2014 21:26:05 +0000 (10:26 +1300)]
Merge branch 'MDL-46978' of https://github.com/danielneis/moodle
Dan Poltawski [Mon, 6 Oct 2014 16:48:28 +0000 (17:48 +0100)]
MDL-46576 grade: fix trailing whitespace
Dan Poltawski [Mon, 6 Oct 2014 17:06:13 +0000 (18:06 +0100)]
Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
lib/upgrade.txt
lib/db/upgrade.php
version.php
Dan Poltawski [Mon, 6 Oct 2014 15:01:26 +0000 (16:01 +0100)]
Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle
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:54:53 +0000 (14:54 +0100)]
MDL-38106 lesson: don't require intro when upgraded
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
Marina Glancy [Mon, 6 Oct 2014 01:50:29 +0000 (09:50 +0800)]
MDL-36014 cohorts: specify exact cohort names in unittest
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 [Fri, 3 Oct 2014 13:28:47 +0000 (14:28 +0100)]
MDL-38106 lesson: behat now sets introduction
Sam Hemelryk [Fri, 1 Aug 2014 05:28:55 +0000 (17:28 +1200)]
MDL-46481 backup: removed collapsing and better lang string
Thanks Rex for the peer-review!
Jean-Michel Vedrine [Sun, 17 Mar 2013 22:40:40 +0000 (23:40 +0100)]
MDL-32870 Lesson: No HTML editor for questions answers and responses
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
Daniel Neis Araujo [Wed, 10 Sep 2014 19:17:16 +0000 (16:17 -0300)]
MDL-38106 mod_lesson: Add introduction field
Marina Glancy [Mon, 15 Sep 2014 02:50:53 +0000 (10:50 +0800)]
MDL-35618 enrol_cohort: remove enrolment button
Marina Glancy [Fri, 12 Sep 2014 07:52:10 +0000 (15:52 +0800)]
MDL-35618 enrol_manual: Add possibility to manually enrol cohort members
Marina Glancy [Wed, 10 Sep 2014 08:42:43 +0000 (16:42 +0800)]
MDL-36014 cohorts: Support cohort visibility in Upload cohorts
Marina Glancy [Tue, 29 Jul 2014 09:44:25 +0000 (17:44 +0800)]
MDL-36014 cohorts: Allow teachers to view cohorts
Added property 'visible' for cohorts. Unsetting it hides the cohort from users in the course.
AMOS BEGIN
CPY [visible,core_moodle],[visible,core_cohort]
AMOS END
Marina Glancy [Tue, 29 Jul 2014 09:41:52 +0000 (17:41 +0800)]
MDL-36014 cohorts: fix string names
Cohort capabilities are defined in lang/en/roles.php, remove(rename) the capability-styled strings
AMOS BEGIN
CPY [cohort:assign,core_assign],[assigncohorts,core_assign]
AMOS END
Adrian Greeve [Fri, 3 Oct 2014 08:59:19 +0000 (16:59 +0800)]
MDL-46576 core_grades: Update upgrade scripts new version number
Marina Glancy [Thu, 2 Oct 2014 10:35:10 +0000 (18:35 +0800)]
MDL-47520 core_grades: added CSS classes to the setup page
Part of: MDL-46576
Damyon Wiese [Fri, 3 Oct 2014 03:37:12 +0000 (11:37 +0800)]
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
David Mudrák [Thu, 18 Sep 2014 11:48:40 +0000 (13:48 +0200)]
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.
David Mudrák [Wed, 17 Sep 2014 19:36:13 +0000 (21:36 +0200)]
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.
David Mudrák [Wed, 17 Sep 2014 21:04:42 +0000 (23:04 +0200)]
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.
David Mudrák [Wed, 17 Sep 2014 21:36:13 +0000 (23:36 +0200)]
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.
David Mudrák [Wed, 17 Sep 2014 13:38:59 +0000 (15:38 +0200)]
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.
Michael Hughes [Fri, 5 Sep 2014 09:05:55 +0000 (10:05 +0100)]
MDL-31936 workshop: Add unit tests for the workshop reset
Michael Hughes [Mon, 1 Sep 2014 11:31:06 +0000 (12:31 +0100)]
MDL-31936 workshop: Initial implementation of the course reset support
David Mudrák [Thu, 25 Sep 2014 16:33:05 +0000 (18:33 +0200)]
MDL-44536 workshop: Fix missing phpDoc for user report callbacks
Jetha Chan [Fri, 3 Oct 2014 07:12:37 +0000 (15:12 +0800)]
MDL-45893 user_menu: based on action_menu, new responsive approach
Marina Glancy [Tue, 30 Sep 2014 09:34:04 +0000 (17:34 +0800)]
MDL-47430 core_grades: rename strings in Behat tests
Marina Glancy [Tue, 30 Sep 2014 01:43:44 +0000 (09:43 +0800)]
MDL-47492 core_grades: Behat test for using scales and mingrade in gradebook
Marina Glancy [Tue, 30 Sep 2014 01:43:25 +0000 (09:43 +0800)]
MDL-47492 behat: refer to table column indexes instead of names
Marina Glancy [Fri, 3 Oct 2014 02:35:32 +0000 (10:35 +0800)]
MDL-47146 core_grades: fix class names (contd)
Part of: MDL-46576
Frederic Massart [Tue, 30 Sep 2014 08:57:13 +0000 (16:57 +0800)]
MDL-47430 core_grades: Adding behat test for alternative mingrade
Part of: MDL-46576
Frederic Massart [Fri, 26 Sep 2014 09:32:08 +0000 (17:32 +0800)]
MDL-47430 core_grades: Handle negative grademin with natural weighting
Part of: MDL-46576
Damyon Wiese [Thu, 2 Oct 2014 16:55:27 +0000 (00:55 +0800)]
MDL-47110 Grades: Get the autoupdateweight behat tests to pass.
Part of: MDL-46576
Damyon Wiese [Thu, 2 Oct 2014 14:18:59 +0000 (22:18 +0800)]
MDL-47110 Grades: Change how updated weights notifications are detected.
Part of: MDL-46576
Adrian Greeve [Thu, 2 Oct 2014 06:20:15 +0000 (14:20 +0800)]
MDL-47110 core_grades: Update to auto_adjust_weights
Part of: MDL-46576
Marina Glancy [Tue, 30 Sep 2014 08:46:53 +0000 (16:46 +0800)]
MDL-47110 grades: more behat tests
Adrian Greeve [Thu, 2 Oct 2014 00:50:42 +0000 (08:50 +0800)]
MDL-47110 core_grades: Normalisation of grade weights.
This includes behat tests for this change.
Part of: MDL-46576
Frederic Massart [Thu, 25 Sep 2014 09:09:07 +0000 (17:09 +0800)]
MDL-47377 core_grades: Behat test to cover 0 weights
Frederic Massart [Thu, 25 Sep 2014 07:45:01 +0000 (15:45 +0800)]
MDL-47377 core_grades: Handle items with a weight of 0
They do not contribute to the category/course total any more.
Part of: MDL-46576
Damyon Wiese [Tue, 30 Sep 2014 03:52:14 +0000 (11:52 +0800)]
MDL-47418 Grades: Fix debugging in behat test.
Marina Glancy [Fri, 26 Sep 2014 06:03:17 +0000 (14:03 +0800)]
MDL-47253 core_grades: display scale in Natural setup
Part of: MDL-46576
Marina Glancy [Thu, 25 Sep 2014 10:27:54 +0000 (18:27 +0800)]
MDL-47253 core_grades: set def aggregation method to Natural
Part of: MDL-46576
Damyon Wiese [Thu, 25 Sep 2014 06:49:09 +0000 (14:49 +0800)]
MDL-47420 Grades: Get unit tests passing on natural grading branch
Part of: MDL-46576
Marina Glancy [Thu, 25 Sep 2014 07:02:15 +0000 (15:02 +0800)]
MDL-47417 core_grades: reset grademax when switching from Natural
in Natural aggregation method the grademax is automatically adjusted
when switching to another aggregation method it should be reset
to 100
Damyon Wiese [Thu, 25 Sep 2014 01:44:00 +0000 (09:44 +0800)]
MDL-47064 Grades: Final fix - set the grademax from the item, not the cat
Part of: MDL-46576
Damyon Wiese [Wed, 24 Sep 2014 08:21:30 +0000 (16:21 +0800)]
MDL-47064 Grades: Peer review cleanups
Changes include:
* Search for existing items to reduce DB queries in grade_category::aggregate_grades
* Comments improvements
* Move brackets to be part of lang string
* Convert aggregationhints to be a class variable instead of passing it around
Part of: MDL-46576
Damyon Wiese [Wed, 24 Sep 2014 05:22:41 +0000 (13:22 +0800)]
MDL-47064 Grades: Add comments to explain this tricky code.
Part of: MDL-46576
Damyon Wiese [Wed, 24 Sep 2014 03:33:10 +0000 (11:33 +0800)]
MDL-47064 Grades: Fix contribution column for other types of aggregation
Part of: MDL-46576
Damyon Wiese [Tue, 23 Sep 2014 07:45:59 +0000 (15:45 +0800)]
MDL-47064 Grades: Add contribution to course total to behat test.
Part of: MDL-46576
Damyon Wiese [Tue, 23 Sep 2014 07:38:54 +0000 (15:38 +0800)]
MDL-47064 Grades: Make the contribution to total column work
Part of: MDL-46576
Damyon Wiese [Fri, 19 Sep 2014 08:34:01 +0000 (16:34 +0800)]
MDL-47064 Grades: Fix the contributed weights column for students and teachers.
Part of: MDL-46576
Simey Lameze [Mon, 15 Sep 2014 04:19:40 +0000 (12:19 +0800)]
MDL-47064 core_grades: fix the calculation of contribution towards total
Part of: MDL-46576
Marina Glancy [Tue, 23 Sep 2014 08:11:48 +0000 (16:11 +0800)]
MDL-47146 core_grades: improve navigation on grade pages
Part of: MDL-46576