cdacdf7f41
Merge branch 'wip-MDL-55930-31' of https://github.com/Beedell/moodle into MOODLE_31_STABLE
2016-11-02 12:50:04 +08:00
a35dea73e7
Merge branch 'MDL-43796_31_blindmarking' of https://github.com/SWiT/moodle into MOODLE_31_STABLE
2016-11-02 12:29:04 +08:00
7fa03088be
Merge branch 'MDL-54112-31' of https://github.com/hcpss-banderson/moodle into MOODLE_31_STABLE
2016-11-01 21:31:04 +00:00
e343b2438b
Merge branch 'mdl31_MDL-47500' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE
2016-11-01 21:29:32 +00:00
26d38b03cd
MDL-55930 Quiz: "Next page button" showing in sequential mode
2016-11-01 11:25:05 +00:00
a20a0a48f0
Merge branch 'MDL-56542-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE
2016-10-31 15:14:02 +00:00
9b16dd4632
MDL-47500 scorm: improved height calculation
2016-10-28 13:42:10 +13:00
e50b26fa7c
MDL-54112 mod_assign: Add scale null grade filter
2016-10-27 10:33:47 -04:00
bf639be2ef
Merge branch 'MDL-56448-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
2016-10-26 17:06:21 +02:00
f093a38342
MDL-56448 mustache: fix json errors in example context
2016-10-26 12:37:40 +01:00
9f809b1818
MDL-56542 lang: Merge English strings from the en_fix language pack
2016-10-25 20:26:36 +02:00
6c91de2362
Merge branch 'mdl56466-moodle31' of https://github.com/tlock/moodle into MOODLE_31_STABLE
2016-10-24 15:24:08 +08:00
a518a7bc8c
MDL-55858 mod_forum: Remove subscription links when not relevant
...
When a forum is force-subscribed or subscription is disabled, do not
include the subscription link in forum posts.
2016-10-18 17:01:03 +02:00
7008ee479d
Merge branch 'MDL-56131-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
2016-10-18 13:44:38 +01:00
a0f41c8b2d
Merge branch 'MDL-56062-31' of https://github.com/lucisgit/moodle into MOODLE_31_STABLE
2016-10-18 12:06:58 +01:00
096ea34f43
Merge branch 'MDL-56345-31' of https://github.com/lucisgit/moodle into MOODLE_31_STABLE
2016-10-18 09:38:41 +02:00
fe9831dd7d
MDL-56466 assign: fix database error with team submissions
...
This fixes the error when viewing the Grading summary with Blind Marking and Team submission is enabled:
ERROR: Incorrect number of query parameters. Expected 32, got 31.
2016-10-18 12:09:16 +10:30
2e22fc8a24
Merge branch 'MDL-56022_m31v3' of https://github.com/sbourget/moodle into MOODLE_31_STABLE
2016-10-18 00:07:30 +02:00
8fbdc47ab8
MDL-56022 Assign: Make folders structure in the downloaded zip optional
...
Special thanks to Matt McDermott for the contributing the Javascript
code to fix this issue.
2016-10-17 16:26:12 -04:00
66add1538d
Merge branch 'MDL-56300_31' of git://github.com/reskit/moodle into MOODLE_31_STABLE
2016-10-17 18:51:17 +02:00
b5179a16d4
Merge branch 'MDL-56208-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
2016-10-17 12:52:28 +01:00
6e4ad85606
MDL-56131 choice: Set maximum lifetime for lock
2016-10-17 13:51:08 +08:00
403cc20e1e
MDL-56208 mod_forum: Move Display period below Group
2016-10-17 11:47:13 +08:00
33b8704892
MDL-43796 assign: Reset revealidentities on restore
...
Set revealidentities to 0 when restoring with blindmarking and no user data
2016-10-14 14:11:05 -04:00
70363d7394
MDL-55630 mod_assign: Exclude users courses from user details
...
Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.
2016-10-14 09:28:29 -04:00
4bb8469038
MDL-56300 mod_assign: Filtering students throws a javascript error
2016-10-14 09:27:30 +02:00
73792e3ff2
MDL-56345 assignfeedback_editpdf: Use correct strings for tool alt text
2016-10-13 10:07:57 +01:00
76e4c52a2f
MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display
2016-10-12 20:47:01 +01:00
7d984d3e6d
MDL-56303 quiz: lack of quiz filtering
...
Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.
2016-10-06 22:22:38 +02:00
e1b37e8638
MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade
...
When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.
2016-10-05 19:30:06 +08:00
0f871cff57
Merge branch 'MDL-54802-31-fix' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE
2016-10-05 10:33:45 +01:00
5749d00b25
MDL-54802 mod_quiz: Move grade to pass error to require passing grade element
...
When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.
Additionaly this patch fixes a small typo in a comment.
2016-10-05 17:17:49 +08:00
139dda66cc
Merge branch 'MDL-45969-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
2016-10-05 09:43:05 +08:00
cc82a7e864
Merge branch 'MDL-56069_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
2016-10-04 16:42:09 +02:00
8796156112
Merge branch 'MDL-56198_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
2016-10-04 09:05:26 +08:00
c213250ca7
MDL-54802 quiz: fix bad whitespace
2016-10-03 14:47:04 +01:00
75e4ff3874
Merge branch 'MDL-54802-31' of git://github.com/lameze/moodle into MOODLE_31_STABLE
2016-10-03 14:47:00 +01:00
75092504a1
Merge branch 'MDL-55421-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
2016-10-03 19:48:28 +08:00
72a08226d6
Merge branch 'MDL-55222-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE
2016-10-03 13:02:28 +08:00
d7a5bef2d6
MDL-56069 quiz: nav buttons don't scroll to the right question
...
When there is more than one question on a page, say questions 2, 3 & 4.
Then when you click the navigation button for Q4, then it should load
the next page scrolled down so that Q4 is visible. That was not working.
2016-09-30 15:05:31 +01:00
e7d8a6079b
MDL-56198 assignment: improve grading info responsiveness
2016-09-30 15:02:13 +01:00
0d5d8ee56a
MDL-45969 editpdf: The logic for showing a previous attempt is wrong
...
It originally was only ever going to show static pdfs for older versions,
but this doesn't make sense in the UI for 3.1.
2016-09-30 13:15:59 +08:00
1c4e222256
MDL-55421 js: add some global ignores to js files
...
This is to prevent linting to be extremely noisy about rollup related
problems.
Should not affect built files.
2016-09-29 16:42:54 +01:00
8eda39addc
Merge branch 'MDL-56019-31' of git://github.com/dpalou/moodle into MOODLE_31_STABLE
2016-09-28 20:08:41 +02:00
4b14b223c2
MDL-55957 behat: Set some text before selecting in Atto
2016-09-28 01:42:17 +02:00
1557906329
Merge branch 'MDL-55957-31-workshopfiles' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE
2016-09-27 10:37:27 +01:00
23460f7fdb
MDL-55222 webservice: Apply external_format_string in course names
2016-09-26 12:42:20 +01:00
ff45fa7435
MDL-55472 assign: Show userlist on extension form error page
2016-09-25 11:32:13 +10:00
10d480aefc
MDL-54802 mod_quiz: Add validation to require passing grade greater than 0
...
This commit adds a form validation to prevent the creation of quizzes
using zero or null grade to pass when using require passing grade.
2016-09-22 08:54:51 +08:00
613c9aa5c8
Merge branch 'm31_MDL-55820' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE
2016-09-19 11:32:21 +01:00
David Monllao