Commit graph

2392 commits

Author SHA1 Message Date
Paul Holden
05680020e7 MDL-67702 mod_assign: distinct uniqueid value for grading tables.
This has the effect of making table sorting and filtering by initials
apply only to the current table instance, rather than to all of them.
2020-11-09 23:18:09 +00:00
Brendan Heywood
8e7ec10968 MDL-70120 assignfeedback_editpdf: Stamp files should be cached 2020-11-04 22:42:21 +11:00
Sara Arjona
ca2db4be71 Merge branch 'MDL-67673' of https://github.com/stronk7/moodle into master 2020-10-21 17:38:05 +02:00
Eloy Lafuente (stronk7)
40de097e65 MDL-67673 phpunit: Remove deprecated assertContains() uses on strings
Both assertContains() and assertNotContains() are deprecated in PHPUnit 8
for operations on strings. Also the optional case parameter is. All uses
must be changed to one of:

- assertStringContainsString()
- assertStringContainsStringIgnoringCase()
- assertStringNotContainsString()
- assertStringNotContainsStringIgnoringCase()

More info: https://github.com/sebastianbergmann/phpunit/issues/3422

Regexp to find all uses:

ag 'assert(Not)?Contains\('
2020-10-21 12:46:00 +02:00
Eloy Lafuente (stronk7)
d95c378771 MDL-67673 phpunit: Remove expectedException annotations
While this is not strictly required, because removal will
happen in PHPUnit 9.0, we are already getting rid of all
uses in core.

From release notes:https://phpunit.de/announcements/phpunit-8.html

The annotations `@expectedException`, `@expectedExceptionCode`,
`@expectedExceptionMessage`, and `@expectedExceptionMessageRegExp`
are now deprecated.
Using these annotations will trigger a deprecation warning
in PHPUnit 8 and in PHPUnit 9 these annotations will be removed.

Also, all uses of expectExceptionMessageRegExp() has been moved
to expectExceptionMessageMatches(). See https://github.com/sebastianbergmann/phpunit/issues/3957

TODO: Various weirdness found while doing the changes with these tests:
- vendor/bin/phpunit lib/tests/exporter_test.php (created MDL-69700)
- vendor/bin/phpunit competency/tests/external_test.php (same issue than prev one)
- vendor/bin/phpunit question/engine/tests/questionengine_test.php (created MDL-69624)
- vendor/bin/phpunit lib/tests/event_test.php (created MDL-69688)
2020-10-21 12:46:00 +02:00
Eloy Lafuente (stronk7)
f6711bb394 MDL-67673 phpunit: Fix the return type of template methods
All the setup/teardown/pre/post/conditions template methods
now are required to return void. This was warned with phpunit 7
and now is enforced.

At the same time, fix a few wrong function names,
provider data and param types, return statements...
2020-10-21 12:45:59 +02:00
Luca Bösch
9340b2a18e MDL-37226 assign: align select all header checkbox 2020-10-16 16:09:09 +02:00
Jake Dallimore
87abb87ebd Merge branch 'MDL-69192-master-behat' of https://github.com/andrewnicols/moodle 2020-10-08 09:22:21 +08:00
Andrew Nicols
36419cf8d5 MDL-68665 assignfeedback_editpdf: Coding style fixes 2020-10-08 08:23:03 +08:00
Andrew Nicols
814ec28fef Merge branch 'MDL-68665-assign-stamp-cache' of https://github.com/jamie-catalyst/moodle 2020-10-08 08:17:01 +08:00
Andrew Nicols
f908e8beef MDL-69192 mod_assign: Stop clicking OK on non-existent modal 2020-10-08 08:04:10 +08:00
Jamie Stamp
e522d6dad4 MDL-68665 assignfeedback_editpdf: Fix systemsstamp URLs 2020-10-07 16:26:16 +01:00
Jamie Stamp
74b4d6368a MDL-68665 assignfeedback_editpdf: Add filearea to persist stamps 2020-10-07 16:25:59 +01:00
Andrew Nicols
675d90a39a Merge branch 'MDL-69192' of https://github.com/willob99/moodle 2020-10-07 13:15:08 +08:00
Jamie Stamp
1343d84cc7 MDL-68665 assignfeedback_editpdf: Improve caching on stamps 2020-10-01 16:59:42 +01:00
willob99
b8ad9a1030 MDL-69192 mod_assign: replace grading confirmation popup 2020-09-30 10:42:12 -07:00
Dani Palou
8c84eeeeac MDL-68098 ws: Fix WebServices broken by filters HTML 2020-09-22 09:43:03 +02:00
Andrew Nicols
3d7fd2f42f Merge branch 'MDL-69112-master' of git://github.com/merrill-oakland/moodle 2020-08-28 13:25:27 +08:00
Victor Deniz Falcon
ffbf74eeb3 Merge branch 'MDL-69297-master' of git://github.com/peterRd/moodle 2020-08-19 23:28:34 +01:00
Adrian Greeve
fe7ef8a59d Merge branch 'MDL-66665-master-POC2' of git://github.com/peterRd/moodle 2020-08-19 14:26:50 +08:00
Peter Dias
0c6b705719 MDL-66665 assign: Check whether a modified user could actually grade 2020-08-19 13:39:18 +08:00
Peter Dias
6de93d2f29 MDL-69297 assign: Check whether there is content for a submission
Confirm there is some content to be submitted for an assignment when processing it.
2020-08-19 12:07:52 +08:00
Eloy Lafuente (stronk7)
fbb0767536 MDL-69475 versions: bump all versions and requires in master
version = 2021052500 release version
requires= 2021052500 same than version

Why 20210525? (25th May 2021) ?

Because master is going to be Moodle 4.0, to be released
on November 2021. And, until then, we are going to have
a couple of "intermediate" releases:

- Moodle 3.10 to be released 9th November 2020. (2020110900)

  This version will be using versions from today to 2020110900
  (once it's released the YYYYMMDD part stops advancing).

- Moodle 3.11 to be released 10th May 2021. (2021051000)

  This version will be using versions from 3.10 release to 2021051000
  (once it's released the YYYYMMDD part stops advancing).

That means that all versions from today to 2021051000 are going
to be used by those 2 "intermediate" releases (3.10 and 3.11).

And we cannot use them in master, because it's forbidden to have
any overlapping of versions between branches (or different upgrade
paths will fail).

So, get that 2021051000, let's add it a couple of weeks to cover
the on-sync period (or a 2 weeks delay max!) and, the first version
that master can "own" in exclusive (without any overlap) is, exactly,
25th May 2021, hence our 20210525.
2020-08-18 00:47:15 +02:00
Adrian Greeve
e9d5a2b0a8 Merge branch 'MDL-60493-grader_span_tag' of https://github.com/leonstr/moodle 2020-08-10 09:20:50 +08:00
Eric Merrill
6ff0525a3f MDL-69112 assign: Improve parsing of uploaded feedback names 2020-07-31 19:06:49 -04:00
Leon Stringer
fe2e2feef4 MDL-60493 mod_assign: Unused JS variables
Removed unused JavaScript variables fixing CI warning "ESLint error
[no-unused-vars]".
2020-07-28 12:01:26 +01:00
Leon Stringer
5a0fd52e3f MDL-60493 mod_assign: Remove rogue </span>
In the grading interface (/mod/assign/view.php?id=2&action=grader)
there was a rogue </span> with no opening <span>.  Also changed
<span><form> to <div><form> in included template fixing CiBoT HTML
Validation error.
2020-07-28 11:59:55 +01:00
Mikhail Golenkov
42f75f5a52 MDL-66626 assignfeedback_editpdf: Check page count for attempt.
Co-Authored-By: John Yao <johnyao@catalyst-au.net>
2020-07-27 09:49:56 +10:00
Mikhail Golenkov
78572f186d MDL-66626 assignfeedback_editpdf: Count files outside of foreach loop.
Co-Authored-By: John Yao <johnyao@catalyst-au.net>
2020-07-27 09:49:56 +10:00
Adrian Greeve
17e99314a2 Merge branch 'MDL-67657-master' of git://github.com/andrewnicols/moodle 2020-07-21 14:47:14 +08:00
Adrian Greeve
d817ccaca5 Merge branch 'MDL-67436-master' of https://github.com/jondo/moodle 2020-07-21 08:28:53 +08:00
Adrian Greeve
867509ac25 Merge branch 'MDL-69113' of https://github.com/jonof/moodle 2020-07-20 10:20:47 +08:00
Sara Arjona
2eb31f8bb3 Merge branch 'MDL-68605_master' of https://github.com/t-schroeder/moodle 2020-07-16 16:21:27 +02:00
Sara Arjona
d189edb843 Merge branch 'MDL-68210-master' of https://github.com/snake/moodle 2020-07-16 16:21:27 +02:00
Robert Pollak
beca5a9300 MDL-67436 mod_assign: "Assignments per page": Sort "All" after "100" 2020-07-16 09:34:57 +02:00
Andrew Nicols
cd6eadd407 MDL-67657 behat: Convert existing uses of executeScript 2020-07-16 11:06:31 +08:00
Jake Dallimore
c467de9ac6 MDL-68210 overrides: allow copy and delete of inactive overrides
This brings lesson and assign in line with the expected behaviour
already implemented in quiz. When an override is inactive, all controls
are shown.
2020-07-08 09:08:27 +08:00
Tim Schroeder
3786de22f2
MDL-68605 mod_assign: return grp submissns from ws
Co-authored-by: Septatrix <24257556+Septatrix@users.noreply.github.com>
2020-07-07 12:55:04 +02:00
Cameron Ball
548c44c89c MDL-69106 assignfeedback_editpdf: Keep files in conversion queue
In some circumstances, a submission waiting to be converted needs to persist
in the conversion queue so that it can be polled on subsequent cron runs.
2020-06-30 11:03:11 +08:00
Jonathon Fowler
c31a32140b MDL-69113 assign: save grader app workflow/marker filters correctly 2020-06-25 14:39:08 +10:00
Jun Pataleta
26f3788857 Merge branch 'MDL-67294-master' of git://github.com/mihailges/moodle 2020-06-17 10:33:55 +08:00
Mihail Geshoski
2e5e143061 MDL-67294 assignsubmission_file: Make sure record exists before updating 2020-06-17 00:50:22 +08:00
Eloy Lafuente (stronk7)
b764343e5a MDL-69044 upgrade: add 3.9.0 separation line to all upgrade scripts 2020-06-14 13:08:09 +02:00
Eloy Lafuente (stronk7)
115cc0214f MDL-68973 versions: bump all versions and requires near release
version = 2020061500 release version
requires= 2020060900 current rc1 (week7roll1) version
2020-06-09 16:23:09 +02:00
David Mudrák
2615e429f4 MDL-68753 lang: Remove a redundant okay string and use "OK" everywhere
The "Ok" (with lower-case "k") string was added in MDL-68409 to keep
backwards compatibility with YUI alerts that had it hard-coded. But we
should not need to explain to translators why we have two OK strings
like this and why they use different wording.

Additionally, there would be inconsistency in Behat tests and everywhere
depending on which "OK" or "Ok" string is used for buttons.

So instead, this patch changes the hard-coded 'Ok' string in the YUI and
we should stick to "OK" from now on everywhere.
2020-05-27 09:59:44 +02:00
Adrian Perez
c1bce8b4c7 MDL-67126 assign: set completion state for all group members 2020-05-18 12:29:01 +02:00
David Mudrák
005b00dd9b MDL-68645 output: Do not apply filters when creating calendar events
Applying filters on an activity module description when using it as a
new calendar event's description is bad m'kay? We need to store the raw
text and apply the filters only when we actually display the text. That
way, filters (such as multi-language content) may actually fully work
and we do not initialise the theme and output machinery.

Additionally, we need to explicitly set the format of the description
text to HTML (because we have converted it to it already). Otherwise it
defaults to the current user's preferred editor format.

This is still a pragmatic hot-fix solution. The proper solution would be
to pass the raw text, format and embedded files.
2020-05-13 10:03:01 +02:00
Andrew Nicols
29c5fafff5 MDL-66109 js: Fix Shifter linting issues 2020-05-11 11:07:49 +08:00
Andrew Nicols
7afd16ad84 MDL-66109 behat: Require newline at EOF
This change enables the gherkinlint rule to require a new line at the
end of the file. This change is in keeping with existing Moodle coding
style guidelines.
2020-05-11 11:07:49 +08:00
Luca Bösch
439c8c5933 MDL-68216 block_recent_activity: Format elements more nicely. 2020-05-05 22:09:19 +02:00