moodle.git
8 years agoMDL-44894 question editing: fix validation with odd permissions
Tim Hunt [Thu, 7 Aug 2014 16:47:37 +0000 (17:47 +0100)]
MDL-44894 question editing: fix validation with odd permissions

For users with edit permissions, but not add permissions, it was
impossible to save the editing form. The validation assuemd this value
was present, but it was not. Other code checks this field too, so I
added it rather than changing the validation and all the other uses.

8 years agoweekly release 2.8dev
Marina Glancy [Thu, 14 Aug 2014 06:52:07 +0000 (14:52 +0800)]
weekly release 2.8dev

8 years agoNOBUG: Fixed file access permissions
Marina Glancy [Thu, 14 Aug 2014 06:52:07 +0000 (14:52 +0800)]
NOBUG: Fixed file access permissions

8 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Thu, 14 Aug 2014 06:52:01 +0000 (14:52 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

8 years agoMDL-45031 theme: fix tabs base line alignment by 1px.
Eloy Lafuente (stronk7) [Wed, 13 Aug 2014 19:31:11 +0000 (21:31 +0200)]
MDL-45031 theme: fix tabs base line alignment by 1px.

Credit goes to Damyon Wiese, thanks!

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 13 Aug 2014 16:05:40 +0000 (00:05 +0800)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-45932-fixes' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 13 Aug 2014 10:03:17 +0000 (12:03 +0200)]
Merge branch 'MDL-45932-fixes' of git://github.com/danpoltawski/moodle

8 years agoMDL-45932 enrol_imsenterprise: lang string fixes
Dan Poltawski [Wed, 13 Aug 2014 09:33:43 +0000 (10:33 +0100)]
MDL-45932 enrol_imsenterprise: lang string fixes

8 years agoMDL-46643 calendar: improved tab order of calendar detail pages
Marina Glancy [Wed, 13 Aug 2014 08:29:45 +0000 (16:29 +0800)]
MDL-46643 calendar: improved tab order of calendar detail pages

8 years agoMerge branch 'MDL-45759-master-2' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 13 Aug 2014 08:23:12 +0000 (16:23 +0800)]
Merge branch 'MDL-45759-master-2' of git://github.com/andrewnicols/moodle

8 years agoMDL-45759 mod_quiz: Correct behat test to reflect changes from a translation fix
Andrew Nicols [Wed, 13 Aug 2014 07:44:52 +0000 (15:44 +0800)]
MDL-45759 mod_quiz: Correct behat test to reflect changes from a translation fix

8 years agoRevert "Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle"
Dan Poltawski [Wed, 13 Aug 2014 07:36:44 +0000 (08:36 +0100)]
Revert "Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle"

This reverts commit 57fdca8cec16f0018537cca9e07581cca601876f, reversing
changes made to 62e30bfbcd14772aa1c2f7ffe990e4b609098549.

8 years agoMerge branch 'MDL-46565_master' of git://github.com/markn86/moodle
Marina Glancy [Wed, 13 Aug 2014 01:25:38 +0000 (09:25 +0800)]
Merge branch 'MDL-46565_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-46697' of git://github.com/aolley/moodle
Eloy Lafuente (stronk7) [Wed, 13 Aug 2014 00:08:07 +0000 (02:08 +0200)]
Merge branch 'MDL-46697' of git://github.com/aolley/moodle

8 years agoMerge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 12 Aug 2014 22:34:03 +0000 (00:34 +0200)]
Merge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 12 Aug 2014 22:24:51 +0000 (00:24 +0200)]
Merge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-46565 gradereport_*: moved report viewed event to bottom of page
Mark Nelson [Wed, 6 Aug 2014 02:41:33 +0000 (19:41 -0700)]
MDL-46565 gradereport_*: moved report viewed event to bottom of page

8 years agoMDL-46565 gradereport_*: renamed event string names
Mark Nelson [Wed, 6 Aug 2014 23:02:17 +0000 (16:02 -0700)]
MDL-46565 gradereport_*: renamed event string names

This makes the strings more descriptive and consistent.

AMOS START
  MOV [eventreportviewed, gradereport_grader],[eventgradereportviewed, gradereport_grader]
  MOV [eventreportviewed, gradereport_outcomes],[eventgradereportviewed, gradereport_outcomes]
  MOV [eventreportviewed, gradereport_overview],[eventgradereportviewed, gradereport_overview]
  MOV [eventreportviewed, gradereport_user],[eventgradereportviewed, gradereport_user]
AMOS END

8 years agoMerge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 12 Aug 2014 13:28:22 +0000 (14:28 +0100)]
Merge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37401' of git://github.com/nobelium/moodle
Dan Poltawski [Tue, 12 Aug 2014 12:58:38 +0000 (13:58 +0100)]
Merge branch 'MDL-37401' of git://github.com/nobelium/moodle

8 years agoMerge branch 'MDL-45642' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 12 Aug 2014 10:34:05 +0000 (11:34 +0100)]
Merge branch 'MDL-45642' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-43824-master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 12 Aug 2014 10:06:53 +0000 (11:06 +0100)]
Merge branch 'MDL-43824-master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 12 Aug 2014 10:04:15 +0000 (11:04 +0100)]
Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle

8 years agoMerge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign
Dan Poltawski [Tue, 12 Aug 2014 10:02:18 +0000 (11:02 +0100)]
Merge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign

8 years agoMerge branch 'MDL-46308' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 12 Aug 2014 08:02:41 +0000 (16:02 +0800)]
Merge branch 'MDL-46308' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-21042_master' of git://github.com/markn86/moodle
Marina Glancy [Tue, 12 Aug 2014 08:01:56 +0000 (16:01 +0800)]
Merge branch 'MDL-21042_master' of git://github.com/markn86/moodle

8 years agoMerge branch 'MDL-46448_rating_ajax2' of git://github.com/andyjdavis/moodle
Marina Glancy [Tue, 12 Aug 2014 07:22:19 +0000 (15:22 +0800)]
Merge branch 'MDL-46448_rating_ajax2' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'm28_MDL-46315' of git://github.com/totara/moodle
Marina Glancy [Tue, 12 Aug 2014 07:01:30 +0000 (15:01 +0800)]
Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle

8 years agoMerge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle
Marina Glancy [Tue, 12 Aug 2014 07:01:19 +0000 (15:01 +0800)]
Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle
Marina Glancy [Tue, 12 Aug 2014 07:01:10 +0000 (15:01 +0800)]
Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-46646-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 12 Aug 2014 05:32:33 +0000 (13:32 +0800)]
Merge branch 'MDL-46646-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'm28_MDL-46643' of git://github.com/totara/moodle
Marina Glancy [Tue, 12 Aug 2014 05:31:25 +0000 (13:31 +0800)]
Merge branch 'm28_MDL-46643' of git://github.com/totara/moodle

8 years agoMerge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle
Marina Glancy [Tue, 12 Aug 2014 05:29:15 +0000 (13:29 +0800)]
Merge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle

8 years agoMDL-46646 gradebook: Optimise generation of the grader report table
Andrew Nicols [Fri, 1 Aug 2014 03:29:08 +0000 (11:29 +0800)]
MDL-46646 gradebook: Optimise generation of the grader report table

The grader report table makes use of various user preferences, and strings
which on every iteration. On a large gradebook, this can have a significant
impact upon performance.
The table also uses html_writer::tag to generate spans for
machine-generated content which becomes expensive on larger gradebooks.

8 years agoMDL-45031 theme_base: Added style/tabs.css and updated config.php
Mary Evans [Mon, 11 Aug 2014 23:59:16 +0000 (00:59 +0100)]
MDL-45031 theme_base: Added style/tabs.css and updated config.php

also removed tabtree css from style/core.css to style/tabs.css.

8 years agoMerge branch 'MDL-46646_master' of https://github.com/Syxton/moodle
Eloy Lafuente (stronk7) [Mon, 11 Aug 2014 23:53:23 +0000 (01:53 +0200)]
Merge branch 'MDL-46646_master' of https://github.com/Syxton/moodle

8 years agoMerge branch 'MDL-46676_master' of https://github.com/ikawhero/moodle
Eloy Lafuente (stronk7) [Mon, 11 Aug 2014 23:48:10 +0000 (01:48 +0200)]
Merge branch 'MDL-46676_master' of https://github.com/ikawhero/moodle

8 years agoMerge branch 'MDL-46681' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 11 Aug 2014 23:44:13 +0000 (01:44 +0200)]
Merge branch 'MDL-46681' of git://github.com/timhunt/moodle

8 years agoMDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale...
Mary Evans [Mon, 11 Aug 2014 22:40:46 +0000 (23:40 +0100)]
MDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale grades.

8 years agoMerge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign
Dan Poltawski [Mon, 11 Aug 2014 16:06:54 +0000 (17:06 +0100)]
Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign

8 years agoMerge branch 'MDL-45932-master' of https://github.com/StudiUM/moodle
Dan Poltawski [Mon, 11 Aug 2014 15:53:51 +0000 (16:53 +0100)]
Merge branch 'MDL-45932-master' of https://github.com/StudiUM/moodle

8 years agoMerge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 11 Aug 2014 13:38:33 +0000 (14:38 +0100)]
Merge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign
Dan Poltawski [Mon, 11 Aug 2014 13:31:02 +0000 (14:31 +0100)]
Merge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign

8 years agoMerge branch 'MDL-46688' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 11 Aug 2014 13:13:12 +0000 (14:13 +0100)]
Merge branch 'MDL-46688' of git://github.com/timhunt/moodle

8 years agoMDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability...
Andrew Davis [Mon, 4 Aug 2014 04:04:37 +0000 (12:04 +0800)]
MDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None"

8 years agoMerge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 11 Aug 2014 10:24:19 +0000 (11:24 +0100)]
Merge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 11 Aug 2014 09:41:40 +0000 (10:41 +0100)]
Merge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip_MDL-46692_m28_forum' of git://github.com/skodak/moodle
Marina Glancy [Mon, 11 Aug 2014 09:24:19 +0000 (17:24 +0800)]
Merge branch 'wip_MDL-46692_m28_forum' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-35984-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 11 Aug 2014 09:22:13 +0000 (17:22 +0800)]
Merge branch 'MDL-35984-master' of git://github.com/damyon/moodle

8 years agoMDL-35984 Grades: Fix deprecation of grade_category::aggregate_values
Damyon Wiese [Mon, 11 Aug 2014 05:28:23 +0000 (13:28 +0800)]
MDL-35984 Grades: Fix deprecation of grade_category::aggregate_values

8 years agoMDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved.
Damyon Wiese [Mon, 4 Aug 2014 07:03:26 +0000 (15:03 +0800)]
MDL-35984 grade: Recalculate min/max for sum of grades when hidden grades are involved.

8 years agoMDL-35984 grade: Add behat tests for grade aggregations
Damyon Wiese [Fri, 1 Aug 2014 07:42:37 +0000 (15:42 +0800)]
MDL-35984 grade: Add behat tests for grade aggregations

8 years agoMerge branch 'MDL-46748-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 11 Aug 2014 07:37:35 +0000 (08:37 +0100)]
Merge branch 'MDL-46748-master' of git://github.com/damyon/moodle

8 years agoMDL-45780 mod_quiz: Autosave should listen for textarea:change events too
Andrew Nicols [Tue, 29 Jul 2014 02:56:49 +0000 (10:56 +0800)]
MDL-45780 mod_quiz: Autosave should listen for textarea:change events too

8 years agoMDL-45780 editor_atto: Update the textarea more often
Andrew Nicols [Mon, 2 Jun 2014 01:41:48 +0000 (09:41 +0800)]
MDL-45780 editor_atto: Update the textarea more often

This change updates the frequency of the textarea update to additionally
update it:
* on keypress; and
* on content paste.

8 years agoMDL-46748 MathJax filter: Update setting default for https cdn url.
Damyon Wiese [Mon, 11 Aug 2014 03:52:32 +0000 (11:52 +0800)]
MDL-46748 MathJax filter: Update setting default for https cdn url.

8 years agoMDL-46748 MathJax filter: Make misconfigured mathjax url less "fatal" for Atto.
Damyon Wiese [Mon, 11 Aug 2014 03:37:35 +0000 (11:37 +0800)]
MDL-46748 MathJax filter: Make misconfigured mathjax url less "fatal" for Atto.

8 years agoMDL-46660 muc: add env check to memcache driver
Petr Skoda [Mon, 4 Aug 2014 03:01:30 +0000 (15:01 +1200)]
MDL-46660 muc: add env check to memcache driver

8 years agoMDL-37401 mod_scorm : autocommit for scorm
Nobelium [Sat, 9 Aug 2014 21:57:03 +0000 (21:57 +0000)]
MDL-37401 mod_scorm : autocommit for scorm

8 years agoMDL-46308 qformat_xml: fix import of broken calculated questions.
Tim Hunt [Fri, 8 Aug 2014 13:36:03 +0000 (14:36 +0100)]
MDL-46308 qformat_xml: fix import of broken calculated questions.

Questions like this should not exist, of course. But they do, so we
should avoid generating errors in this case.

8 years agoMDL-46688 weblib: improve the highlight function.
Tim Hunt [Fri, 8 Aug 2014 10:31:27 +0000 (11:31 +0100)]
MDL-46688 weblib: improve the highlight function.

Thanks to Joseph Baxter for suggesting some of the test cases.

8 years agoMDL-45642 questions: add required index to question_attempts.
Tim Hunt [Fri, 8 Aug 2014 12:56:23 +0000 (13:56 +0100)]
MDL-45642 questions: add required index to question_attempts.

It is important to be able to tell which behaviours are in use, and
without this index, it requires a complete scan of this table, which can
be very big, to verify that a behaviour is unused.

8 years agoMDL-30668 gradereport_grader: split user preferences into individual courses
Marina Glancy [Fri, 1 Aug 2014 08:05:31 +0000 (16:05 +0800)]
MDL-30668 gradereport_grader: split user preferences into individual courses

This solves the DB exception when users were trying to insert very large string in DB

8 years agoMDL-46496 libraries: Add additional tests for jquery and jqueryUI
Andrew Nicols [Fri, 8 Aug 2014 06:06:19 +0000 (14:06 +0800)]
MDL-46496 libraries: Add additional tests for jquery and jqueryUI

The additional tests add a clear example of the use of jquery UI images in
addition to working JavaScript.

8 years agoMDL-46718: Return user to last accessed page when quick grading
Gregory Faller [Fri, 8 Aug 2014 04:31:02 +0000 (14:01 +0930)]
MDL-46718: Return user to last accessed page when quick grading

8 years agoMDL-45759 javascript: Handle setting of the confirm button fields post-init
Andrew Nicols [Thu, 29 May 2014 16:11:24 +0000 (00:11 +0800)]
MDL-45759 javascript: Handle setting of the confirm button fields post-init

8 years agoMDL-46480 fix get_htmlelement_size() to deal with hidden or non-block elements
Petr Skoda [Thu, 7 Aug 2014 22:28:11 +0000 (10:28 +1200)]
MDL-46480 fix get_htmlelement_size() to deal with hidden or non-block elements

8 years agoMDL-46681 qtype_multichoice: disabled unused options
Tim Hunt [Thu, 7 Aug 2014 13:20:06 +0000 (14:20 +0100)]
MDL-46681 qtype_multichoice: disabled unused options

For questions set to 'One answer only', the 'Clear incorrect responses'
and 'Show the number of correct responses' hint options make not sense,
and are not used. Hence we disableIf them.

8 years agoweekly release 2.8dev
Marina Glancy [Thu, 7 Aug 2014 05:14:54 +0000 (13:14 +0800)]
weekly release 2.8dev

8 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Thu, 7 Aug 2014 05:14:52 +0000 (13:14 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

8 years agoMDL-21042 report_security: don't display warning for riskbackup unnecessarily
Paul Holden [Fri, 6 Jan 2012 11:52:31 +0000 (11:52 +0000)]
MDL-21042 report_security: don't display warning for riskbackup unnecessarily

8 years agoMerge branch 'wip-mdl-46175' of https://github.com/rajeshtaneja/moodle
Marina Glancy [Thu, 7 Aug 2014 02:02:25 +0000 (10:02 +0800)]
Merge branch 'wip-mdl-46175' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-32917-master-1' of https://github.com/andrewnicols/moodle
Marina Glancy [Thu, 7 Aug 2014 02:01:24 +0000 (10:01 +0800)]
Merge branch 'MDL-32917-master-1' of https://github.com/andrewnicols/moodle

8 years agoMDL-46175 behat: Fixed lang changes in gradebook
Rajesh Taneja [Thu, 7 Aug 2014 01:39:58 +0000 (09:39 +0800)]
MDL-46175 behat: Fixed lang changes in gradebook

8 years agoMDL-45897 behat: fixed behat for my home page
Rajesh Taneja [Thu, 7 Aug 2014 01:39:07 +0000 (09:39 +0800)]
MDL-45897 behat: fixed behat for my home page

8 years agoMDL-32917 calendar: Fix centering of calendar heading on IE10
Andrew Nicols [Thu, 7 Aug 2014 01:31:45 +0000 (09:31 +0800)]
MDL-32917 calendar: Fix centering of calendar heading on IE10

8 years agoMDL-46561 session: use full session validation in \core\session\manager::session_exists()
Petr Skoda [Tue, 5 Aug 2014 00:11:43 +0000 (12:11 +1200)]
MDL-46561 session: use full session validation in \core\session\manager::session_exists()

8 years agoMDL-46448 core_rating: now only formats rating aggregate if user can see it
Andrew Davis [Wed, 6 Aug 2014 10:28:56 +0000 (18:28 +0800)]
MDL-46448 core_rating: now only formats rating aggregate if user can see it

8 years agoMDL-46676 profilefield_datetime: Use moodle time API
Shane Elliott [Tue, 5 Aug 2014 03:23:15 +0000 (11:23 +0800)]
MDL-46676 profilefield_datetime: Use moodle time API

8 years agoMDL-46697 gradebook: Only count active users when needed (and only id)
Adam Olley [Wed, 6 Aug 2014 06:28:08 +0000 (15:58 +0930)]
MDL-46697 gradebook: Only count active users when needed (and only id)

The code only needs the id column to perform its count. On courses with a lot of users
fetching the whole user record for them all easily adds up to several hundred MB of
memory.

8 years agoMDL-44015: EditPDF scrolls instead of drawing on iOS
Gregory Faller [Wed, 6 Aug 2014 05:15:43 +0000 (14:45 +0930)]
MDL-44015: EditPDF scrolls instead of drawing on iOS

8 years agoMDL-44343 mod_glossary: Stop trying to pass deprecated unused variable for printing...
Andrew Nicols [Wed, 6 Aug 2014 04:04:00 +0000 (12:04 +0800)]
MDL-44343 mod_glossary: Stop trying to pass deprecated unused variable for printing attachments

8 years agoMDL-46470 bootstrapbase: support linkedwhenselected attribute for tabs
Marina Glancy [Tue, 22 Jul 2014 06:05:52 +0000 (14:05 +0800)]
MDL-46470 bootstrapbase: support linkedwhenselected attribute for tabs

8 years agoMDL-46600 core_grades: made it explicit in the error message that a failed grade...
Andrew Davis [Wed, 6 Aug 2014 02:58:59 +0000 (10:58 +0800)]
MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported.

8 years agoMDL-46565 gradereport_*: renamed report classes to match parent
Mark Nelson [Wed, 6 Aug 2014 02:40:03 +0000 (19:40 -0700)]
MDL-46565 gradereport_*: renamed report classes to match parent

8 years agoMDL-46524: Auto-create groups from existing group or grouping membership
Gregory Faller [Wed, 6 Aug 2014 01:20:14 +0000 (10:50 +0930)]
MDL-46524: Auto-create groups from existing group or grouping membership

8 years agoMDL-46692 forum: fix defaultpreference_trackforums to not depend on forum settings
Petr Skoda [Tue, 5 Aug 2014 21:08:06 +0000 (09:08 +1200)]
MDL-46692 forum: fix defaultpreference_trackforums to not depend on forum settings

Existence of admin settings must not depend on other settings,
especially not from other plugins.

In any case somebody should cleaup the preference mess and allow
plugins to setup user preferences instead of hardcoding everything in
core.

8 years agoMerge branch 'MDL-46548-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 5 Aug 2014 18:24:32 +0000 (19:24 +0100)]
Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 5 Aug 2014 18:14:15 +0000 (19:14 +0100)]
Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle

8 years agoMDL-45932 enrol_imsenterprise: Implement Scheduled Task for IMS Enrolment plugin.
David Ligne [Tue, 5 Aug 2014 17:41:09 +0000 (13:41 -0400)]
MDL-45932 enrol_imsenterprise: Implement Scheduled Task for IMS Enrolment plugin.

8 years agoMDL-46646 course: regression in behat tests
Syxton [Tue, 5 Aug 2014 12:43:13 +0000 (08:43 -0400)]
MDL-46646 course: regression in behat tests

Newly introduced unit tests are failing because the timestamps used are
too large.  Example timestamps were 11 characters long instead of 10.

8 years agoMerge branch 'm28_MDL-46625' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 5 Aug 2014 11:04:11 +0000 (13:04 +0200)]
Merge branch 'm28_MDL-46625' of https://github.com/totara/moodle

8 years agoMerge branch 'wip_MDL-39840_m28_addonenv' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 5 Aug 2014 08:22:36 +0000 (16:22 +0800)]
Merge branch 'wip_MDL-39840_m28_addonenv' of https://github.com/skodak/moodle

8 years agoMDL-39840 environment: add support for environment.xml in plugins
Petr Skoda [Mon, 21 Jul 2014 00:22:40 +0000 (12:22 +1200)]
MDL-39840 environment: add support for environment.xml in plugins

New features:

* environment.xml files in all types of plugins
* support for plugin strings via new optional plugin attribute in FEEDBACK
* support for class_name::method_name custom callbacks and classloader

8 years agoMerge branch 'wip-MDL-41639-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 5 Aug 2014 07:52:50 +0000 (15:52 +0800)]
Merge branch 'wip-MDL-41639-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-45897_my2' of https://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 5 Aug 2014 04:06:36 +0000 (12:06 +0800)]
Merge branch 'MDL-45897_my2' of https://github.com/andyjdavis/moodle

8 years agoMDL-46315 themes: Fixed display inconsistancy with help modals
Brian Barnes [Mon, 4 Aug 2014 21:24:30 +0000 (09:24 +1200)]
MDL-46315 themes: Fixed display inconsistancy with help modals

8 years agoMDL-45897 blocks: added 3 new default blocks to /my
Andrew Davis [Thu, 26 Jun 2014 12:10:11 +0000 (20:10 +0800)]
MDL-45897 blocks: added 3 new default blocks to /my

8 years agoMerge branch 'MDL-46641-delete-activity-step' of https://github.com/rlorenzo/moodle
Eloy Lafuente (stronk7) [Tue, 5 Aug 2014 00:24:48 +0000 (02:24 +0200)]
Merge branch 'MDL-46641-delete-activity-step' of https://github.com/rlorenzo/moodle

8 years agoMerge branch 'MDL-44149-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 4 Aug 2014 15:10:38 +0000 (17:10 +0200)]
Merge branch 'MDL-44149-master' of git://github.com/damyon/moodle