92237 Commits

Author SHA1 Message Date
Tobias Reischmann
6555342863
MDL-64891 gradebook: Disable grade display type dependent on grade type
If the grade types text or none are selected for an item or a category,
none of the 'grade display type' options  will change the displayed
grade within the reports. Thus, we can disable the settings for grade
display type as well as the one for decimal places in this case.
2019-02-18 17:17:25 +01:00
Andrew Nicols
124999563a weekly release 3.7dev 2019-02-15 08:29:14 +08:00
Andrew Nicols
a5bd8d9658 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-02-15 08:29:12 +08:00
Jun Pataleta
26dc34e938 Merge branch 'MDL-64552_admin_hideif' of git://github.com/davosmith/moodle 2019-02-14 15:12:22 +08:00
Jun Pataleta
401d0c06f3 Merge branch 'MDL-64736-master-2' of git://github.com/andrewnicols/moodle 2019-02-14 15:00:56 +08:00
Andrew Nicols
9a8920f751 Merge branch 'MDL-64788_master' of git://github.com/markn86/moodle 2019-02-14 09:40:13 +08:00
Jun Pataleta
28785ee630 Merge branch 'MDL-63892-master-rework' of git://github.com/mickhawkins/moodle 2019-02-13 21:01:32 +08:00
Michael Hawkins
0753bb4238 MDL-63892 mod_forum: Behat update for post order 2019-02-13 17:32:24 +08:00
Jun Pataleta
dce039ae48 Merge branch 'MDL-64835-master' of git://github.com/andrewnicols/moodle 2019-02-13 16:27:15 +08:00
Jun Pataleta
a755876b79 Merge branch 'MDL-64557_course_hideif' of git://github.com/davosmith/moodle 2019-02-13 16:17:44 +08:00
Andrew Nicols
b52c83726e MDL-63977 Behat: Wait longer for app login 2019-02-13 14:14:32 +08:00
Andrew Nicols
502fff1c1f MDL-63977 Behat: Prefer ionic approot over wwwroot 2019-02-13 13:55:34 +08:00
Andrew Nicols
d1570a6f52 Merge branch 'MDL-63977-beforemerge' of https://github.com/sammarshallou/moodle 2019-02-13 13:21:15 +08:00
Andrew Nicols
568b7d3fc0 Merge branch 'MDL-64714-master' of git://github.com/cescobedo/moodle 2019-02-13 11:22:24 +08:00
Andrew Nicols
fc9694d1e5 Merge branch 'MDL-63892-master-rework' of git://github.com/mickhawkins/moodle 2019-02-13 10:18:25 +08:00
Andrew Nicols
9626e56812 MDL-64835 JS: Reduce cache invalidation checks
The cache invalidation check was previously occuring every time either
the `set` or `get` function was called on the cache. However, the cache
invalidation check is based on the jsrev which is static for the
lifetime of the page.

This change moved the invalidation to happen during the setup of the AMD
module such that it only happens one time per storage type (Local +
Session).
2019-02-13 10:13:05 +08:00
Andrew Nicols
dd663b41bc MDL-64835 JS: Stop using the jsrev in the jsrevPrefix
We only use the jsrevPrefix to determine if the cache should be
invalidated, but the prefix that we were using is based on the new
jsrev.

For example, the jsrevPrefix will be:

    hash(wwwroot + '/ + config.jsrev) + '/jsrev'

Where config.jsrev is the _current_ (new) jsrev.

As a result when searching for the jsrev used to store the data which is
currently in the storage cache, no key is returned, and we instead set
an 'initial' value and the cache is not cleared

This patch changes the jsrevPrefix to be:

    hash(wwwroot) + '/jsrev'

Since the wwwroot does not change, the key remains static for the
current site. As a result, when the jsrev is bumped via a Moodle cache
purge, we are able to correctly fetch the old jsrev from the cache,
determine that the jsrev has changed, and purge the cache.
2019-02-13 10:11:42 +08:00
AMOS bot
36ddd6c1a3 Automatically generated installer lang files 2019-02-13 00:11:35 +00:00
sam marshall
d178865b38 MDL-63977 Behat: Organise app functions in window.behat object 2019-02-12 13:26:39 +00:00
Eloy Lafuente (stronk7)
752e2f85e7 Merge branch 'MDL-64420-2' of https://github.com/timhunt/moodle 2019-02-12 12:56:18 +01:00
David Monllaó
6f5d32ea4d Merge branch 'MDL-64590' of https://github.com/timhunt/moodle 2019-02-12 12:45:48 +01:00
David Monllaó
f4a99aa5eb Merge branch 'MDL-64646' of https://github.com/mkassaei/moodle 2019-02-12 12:42:48 +01:00
David Monllaó
9426a13cfe Merge branch 'master' of https://github.com/CengageEng/moodle 2019-02-12 12:33:23 +01:00
sam marshall
3e42f121f2 MDL-63977 Behat: Read config.json version from running Ionic server 2019-02-12 11:18:21 +00:00
Davo Smith
c5ec8db43b MDL-64557 tool_behat: fix broken test 2019-02-12 10:18:04 +00:00
Davo Smith
309686547a MDL-64557 category: switch disabledIf to hideIf on delete form 2019-02-12 10:18:04 +00:00
Davo Smith
87c7fb6e9a MDL-64557 modform: switch disabledIf to hideIf, where appropriate 2019-02-12 10:18:04 +00:00
David Monllaó
59f75c4f41 Merge branch 'MDL-32096-master' of git://github.com/peterRd/moodle 2019-02-12 09:41:35 +01:00
Andrew Nicols
b1deb76f66 Merge branch 'MDL-64291' of https://github.com/KietChan/moodle 2019-02-12 10:55:10 +08:00
Jun Pataleta
ae242c33f8 Merge branch 'MDL-64493-master' of git://github.com/damyon/moodle 2019-02-12 10:12:21 +08:00
Andrew Nicols
93060b9508 MDL-64736 course: Rewrite behat step to avoid changing a checkbox 2019-02-12 07:41:34 +08:00
Eloy Lafuente (stronk7)
a88dfa1bf6 Merge branch 'MDL-61326-master' of git://github.com/peterRd/moodle 2019-02-12 00:19:07 +01:00
Eloy Lafuente (stronk7)
3b996f2a4e Merge branch 'MDL-64694_master' of git://github.com/dmonllao/moodle 2019-02-12 00:09:46 +01:00
Peter
8c7d6407b9 MDL-61326 repository_equella: Pass proper labels for roles with no name 2019-02-12 07:09:13 +08:00
Eloy Lafuente (stronk7)
c50e52d318 Merge branch 'MDL-64606-master' of https://github.com/lucaboesch/moodle 2019-02-12 00:02:12 +01:00
Eloy Lafuente (stronk7)
095d42c297 Merge branch 'MDL-64238-master' of git://github.com/peterRd/moodle 2019-02-11 23:56:44 +01:00
sam marshall
ff3ccab52e MDL-63977 Behat: Rename Ionic config variables for consistency 2019-02-11 16:40:56 +00:00
sam marshall
079eae376c MDL-63977 Behat: Make standard login step work for app as well 2019-02-11 16:20:43 +00:00
sam marshall
a3892e0ef5 MDL-63977 Behat: Move app startup to before-scenario hook 2019-02-11 16:20:43 +00:00
sam marshall
66901a6968 MDL-63977 Behat: Add generic way to get tag list 2019-02-11 16:20:42 +00:00
sam marshall
d8218a3f09 MDL-63977 Behat: Fix bug in 'near' calculation 2019-02-11 16:20:42 +00:00
sam marshall
e0564a3264 MDL-63977 Behat: Upgrade mobile tests to work with 3.6 app version 2019-02-11 16:20:42 +00:00
sam marshall
1959e16412 MDL-63977 Behat: Allow Behat testing of the Moodle mobile app
This change allows you to write and run Behat tests that cover the
mobile app. These should have the @app tag. They will be run in the
Chrome browser using an Ionic server on the local machine.

See config-dist.php for configuration settings, or full docs here:
https://docs.moodle.org/dev/Acceptance_testing_for_the_mobile_app
2019-02-11 16:20:42 +00:00
Eloy Lafuente (stronk7)
18cc7a2ceb Merge branch 'MDL-64725-master' of git://github.com/junpataleta/moodle 2019-02-11 17:03:55 +01:00
John Beedell
0d3be6d648 MDL-64420 qtype: gapselect unit tests unsafe 2019-02-11 13:53:24 +00:00
Eloy Lafuente (stronk7)
690bedf26c Merge branch 'MDL-64599' of https://github.com/marcusboon/moodle 2019-02-11 12:50:46 +01:00
Eloy Lafuente (stronk7)
fdb3de8a05 Merge branch 'MDL-64385-master' of git://github.com/aanabit/moodle 2019-02-11 12:35:26 +01:00
Sara Arjona
7bc2d6e644 Merge branch 'MDL-64031-master' of https://github.com/lethevinh/moodle 2019-02-11 12:33:06 +01:00
Peter
448584b5df MDL-60384 mod_book: Add a label to highlight the previous chapter
* Added current chapter's title to the button title so it's clear where you're adding the chapter to.
* Update the behat tests to reflect the changes made to the title
2019-02-11 11:16:39 +01:00
David Monllaó
9e5d41ee1d Merge branch 'MDL-64391_master' of git://github.com/vmdef/moodle 2019-02-11 11:08:20 +01:00