22122 Commits

Author SHA1 Message Date
Andrew Nicols
5c617d81e6 Merge branch 'MDL-66818-master' of git://github.com/lameze/moodle 2020-08-20 08:16:07 +08:00
Simey Lameze
7235771927 MDL-66818 mod_forum: remove unnecessary behat steps 2020-08-20 08:03:53 +08:00
gthomas2
4224b8e541 MDL-66818 mod_forum: hide portfolio export button based on caps 2020-08-20 07:46:09 +08:00
Andrew Nicols
575e4d3efd Merge branch 'MDL-69401-master' of git://github.com/mihailges/moodle 2020-08-20 07:00:55 +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
Andrew Nicols
f24aae4cad Merge branch 'MDL-67735-master' of git://github.com/bmbrands/moodle 2020-08-19 08:28:49 +08:00
Eloy Lafuente (stronk7)
44c8fe38c7 Merge branch 'MDL-63375-master' of https://github.com/syxton/moodle into master 2020-08-19 00:13:02 +02: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
Bas Brands
4394f9e358 MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css 2020-08-17 08:16:42 +00:00
Mihail Geshoski
0a9bc0cdfe MDL-69401 book: Limit character length in chapter title 2020-08-17 09:03:13 +08:00
Andrew Nicols
e0f91914a7 Merge branch 'MDL-69253' of https://github.com/timhunt/moodle 2020-08-13 11:50:09 +08:00
Eloy Lafuente (stronk7)
d337e7a546 Merge branch 'MDL-68860' of https://github.com/paulholden/moodle into master 2020-08-13 00:55:09 +02:00
Eloy Lafuente (stronk7)
d40cecdb8a Merge branch 'MDL-67002' of https://github.com/timhunt/moodle into master 2020-08-13 00:08:17 +02:00
Andrew Nicols
12403bc004 Merge branch 'MDL-68618' of https://github.com/paulholden/moodle 2020-08-12 13:39:20 +08:00
Andrew Nicols
d6c8f14ed9 Merge branch 'MDL-68731' of https://github.com/jonof/moodle 2020-08-12 08:32:00 +08:00
Paul Holden
e9a5485f3e MDL-68618 mod_forum: stop reverting idnumber when updating instance. 2020-08-10 09:11:02 +01:00
Paul Holden
36a34b89f6 MDL-68860 mod_lti: Oracle support for retrieving shared secrets.
Thanks to Mark van Hoek!
2020-08-10 09:05:58 +01: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
Matt Davidson
66570e4c27 MDL-63375 workshop: fix rubric grid view 2020-08-07 08:47:27 -04:00
Jun Pataleta
05cc2df693 Merge branch 'MDL-69111-master' of git://github.com/bmbrands/moodle 2020-08-06 11:37:12 +08:00
Adrian Greeve
61856e5ef5 Merge branch 'MDL-40227-master-1' of git://github.com/peterRd/moodle 2020-08-06 11:25:58 +08:00
Peter
407a666064 MDL-40227 mod_lesson: Use localised float formatting
* Leverage PARAM_LOCALISEDFLOAT
* Store all numbers with standard '.' dec formatting
* Show all numbers based on locale settings
* Behat test to cover different cases using numeric questions and modified locale setting
2020-08-06 10:44:08 +08:00
Adrian Greeve
e77dc824f5 Merge branch 'master-MDL-66626' of https://github.com/golenkovm/moodle 2020-08-06 09:05:57 +08:00
Adrian Greeve
71d61a7c8c Merge branch 'MDL-68647-master-forumprivacysql' of git://github.com/mudrd8mz/moodle 2020-08-05 14:18:24 +08:00
Tim Hunt
5516275fda MDL-69253 mod_quiz: unit test for the last commit 2020-08-04 14:37:25 +01:00
Josh Ebarvia
380534b0a1 MDL-69253 mod_quiz: Fix timecreated is 0 when creating a quiz activity 2020-08-04 13:43:45 +01:00
Eloy Lafuente (stronk7)
30a82af15e Merge branch 'MDL-55299-master' of git://github.com/ferranrecio/moodle into master 2020-08-04 12:33:51 +02:00
Eloy Lafuente (stronk7)
c39b0d178c Merge branch 'MDL-69367' of https://github.com/paulholden/moodle into master 2020-08-03 16:26:59 +02:00
Eloy Lafuente (stronk7)
c39e659a33 Merge branch 'MDL-37745-master' of git://github.com/lucaboesch/moodle into master 2020-07-30 01:01:47 +02:00
Victor Deniz Falcon
f8c999616a Merge branch 'MDL-66707-master' of git://github.com/rezaies/moodle 2020-07-29 22:36:49 +01:00
Victor Deniz Falcon
4d0e43ffc5 Merge branch 'MDL-69199-master' of git://github.com/aanabit/moodle 2020-07-29 11:43:32 +01:00
Jonathon Fowler
1ce5dbad41 MDL-68731 forum: fix digests not correctly updating post read statuses 2020-07-29 15:41:42 +10:00
Eloy Lafuente (stronk7)
8ab154a5c1 Merge branch 'MDL-69319-master' of https://github.com/snake/moodle 2020-07-29 00:16:09 +02:00
Paul Holden
279d691f58 MDL-69367 quizaccess_seb: correct foreign key table reference. 2020-07-28 13:27:45 +01: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
Eloy Lafuente (stronk7)
24ccd6e908 Merge branch 'MDL-68107-master' of git://github.com/bmbrands/moodle 2020-07-28 12:40:04 +02:00
Bas Brands
99ddf538ca MDL-68107 mod_label: make images dropped onto courses responsive 2020-07-27 09:55:43 +02: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
Luca Bösch
84197640eb MDL-37745 mod_choice: Show taken and limit. 2020-07-26 00:08:37 +02:00
Tim Hunt
45722f4188 MDL-67002 quiz reports: fix sorting on Oracle in the responses report 2020-07-24 11:42:50 +01:00
Sergio Comerón
a1087ef609 MDL-66755 forum: Subscription cancel when edit a message 2020-07-24 09:05:17 +02:00
Amaia Anabitarte
2d710f35cd MDL-69199 mod_quiz: Show timefinish in user Complete report 2020-07-23 18:53:49 +02:00
Ferran Recio
5025c1ad82 MDL-55299 mod_feedback: fix quoted values donwload 2020-07-22 18:47:37 +02:00
Andrew Nicols
b284293402 MDL-69138 behat: Update session->visit() to use visit step 2020-07-22 16:43:08 +08:00
Eloy Lafuente (stronk7)
8e44da5653 Merge branch 'MDL-69160-master' of git://github.com/andrewnicols/moodle 2020-07-21 23:29:29 +02:00