Commit graph

2668 commits

Author SHA1 Message Date
Sara Arjona
9d58d4de46 Merge branch 'MDL-67494-master' of git://github.com/lameze/moodle 2021-03-03 11:45:28 +01:00
Simey Lameze
ac0a0bad63 MDL-67494 calendar: only user overrides should retain userid 2021-03-03 16:06:32 +08:00
Eloy Lafuente (stronk7)
ac9b920981 Merge branch 'MDL-70964-master-enfix' of git://github.com/mudrd8mz/moodle 2021-03-01 09:33:49 +01:00
Helen Foster
422e70e308 MDL-70964 lang: Import fixed English strings (en_fix) 2021-02-25 16:18:57 +01:00
Víctor Déniz
534eae88d7 Merge branch 'MDL-70038-master' of https://github.com/jpahullo/moodle 2021-02-23 11:14:14 +00:00
Jordi Pujol Ahulló
96557076a2 MDL-70038 assign: add suport for pdftoppm tool
pdftoppm (from poppler-utils package) is several orders of
magnitude quicker than ghostscript extracting PNG images
from PDF documents.

We add support for this tool and use it whenever set up,
or using gs as before if missing.

Revisited code with peer review comments. In particular:

1. Make default path for pdftoppm empty string.
2. Fix a typo on the method description for get_gs_command_for_image.
3. Added more information why is useful pdftoppm into string pathtopdftoppm_help.
4. Check that path for pdftoppm is executable to prevent errors. Otherwise, use gs.
2021-02-23 08:07:20 +01:00
Andrew Nicols
ab024ac209 Merge branch 'MDL-47410-master' of git://github.com/mihailges/moodle 2021-02-17 09:34:22 +08:00
Marina Glancy
0eada7a5f9 MDL-70893 various: optional function arguments must be in the end 2021-02-15 16:53:37 +01:00
Mihail Geshoski
46fd92b938 MDL-47410 mod_assign: Update mod_assign behat tests
Updates the mod_assign behat tests to utilize the ability to
conviniently populate the datetime selector fields.
2021-02-11 12:05:58 +08:00
Adrian Greeve
9cacb16c01 Merge branch 'MDL-69867-master_display_grade_with_scale' of git://github.com/moffe42/moodle 2021-02-11 09:23:50 +08:00
Jacob Christiansen
0770d9fec3 MDL-69867 mod_assign: Display current grade with scale value
When using workflow we show the current grade with its scale value
instead of the internal index
2021-02-10 08:13:05 +01:00
Sujith Haridasan
a44dbf0894 MDL-52420 mod_assign: Save comment when save buttons are clicked
Save comment in the assignment when the Save changes
or Save and show next button are clicked at the bottom
of the page.

Signed-off-by: Sujith Haridasan <sujith@moodle.com>
2021-02-02 10:52:13 +05:30
Eloy Lafuente (stronk7)
938c018963 Merge branch 'MDL-66979-master-7' of git://github.com/andrewnicols/moodle 2021-01-26 22:43:54 +01:00
Andrew Nicols
fd5b398488 MDL-66979 mod_assign: Stop clicking the user filters
Remove the documented hack which was re-opening a popup because it
"closes for some reason". It no longer randomly closes.
2021-01-22 14:52:11 +08:00
Andrew Nicols
a61c4fbce3 MDL-66979 behat: Switch to generators
These steps were creating content manually in an unnecessary fashion. I
had to debug some issues with features in these areas so took the time
to update them to make use of data generators, which are significantly
faster.
2021-01-22 14:52:11 +08:00
Mikhail Golenkov
ddcd769e93 MDL-69631 assign: Add 'Draft' filter for grading table 2021-01-21 14:36:01 +11:00
Sara Arjona
7d24686e59 Merge branch 'MDL-69308' of https://github.com/stronk7/moodle 2021-01-14 12:03:30 +01:00
Jun Pataleta
adbebb3bcc Merge branch 'MDL-70312' of git://github.com/paulholden/moodle 2021-01-14 11:54:37 +08:00
Eloy Lafuente (stronk7)
77342b96fc MDL-69308 upgrade: remove all the < 3.6.0 upgrade steps
This just deletes all the upgrade steps previous to 3.6.0. Some
small adjustments, like tweaking globals can also be applied
when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2018120300 (v3.6.0) as anti-cheating measure.

Note that in this case, there wasn't any case of upgradelib
functions being used, hence we haven't to deprecate/remove
anything in codebase. When there is such a need, that is done
in separate commits (one for each function) and documented here.

See MDL-65809 commits for an example removing/deprecating a
good number of functions.
2021-01-13 19:11:19 +01:00
Eloy Lafuente (stronk7)
a1c6c4b5a1 Merge branch 'MDL-70550-master-enfix' of git://github.com/mudrd8mz/moodle 2021-01-09 13:17:35 +01:00
David Mudrák
2fba82e7b6 MDL-70550 lang: Use the fixed strings in Behat tests, too 2021-01-08 08:33:42 +01:00
Helen Foster
8e080c9703 MDL-70550 lang: Import fixed English strings (en_fix) 2021-01-07 19:35:32 +01:00
Paul Holden
a2a410fe09 MDL-70312 libraries: upgrade to version 2.3.5 of FPDI. 2021-01-04 09:34:17 +00:00
Mikhail Golenkov
c8229e3915 MDL-70520 mod_assign: Use task API to get scheduled task lastruntime 2020-12-22 12:57:17 +11:00
Mark Nelson
3b687239da MDL-68533 mod_assign: stream files when creating zip 2020-12-12 12:44:55 +08:00
Andrew Nicols
78d4adf7e2 MDL-70151 assign: Fix bulk change for behat
Behat does not play well with confirmation dialogues and in some
situations it does not wait for the page to reload before starting the
next step.

This change adds a pending_js call which is only resolved if the cancel
button was pressed, otherwise it remains in-progress until the page
reloads resetting the entire state of it.
2020-11-23 11:11:23 +08:00
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