Commit graph

7915 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
85f47bae7f MDL-65204 phpunit: various fixes to assertions
Namely:
   - 3rd param of assertEquals() cannot be null.
   - Some incorrect uses of assertNotEmpty().
   - Comparing 2 strings now uses strict (===) evaluation.
       Link: https://github.com/sebastianbergmann/phpunit/issues/3185
     Solution here is one of:
       a) Return to the previous situation, making the comparison
          softer. That can achieved by forcing different types, so
          float == string works.
       b) Changing APIs (both forms and database return strings) to
          perform some conversion to floats. That would make float
          comparison (with floats or strings) to work too.
     The patch here follows the a) approach. Changing all the internals
     for proper float handling sounds excesive when it has been working
     perfectly since ever. So we went the easier route, just getting
     rid of the new === comparisons when needed by changing expectation
     types to float.
2019-04-03 10:39:19 +08:00
Jake Dallimore
849d2e5dad Merge branch 'MDL-63569-email-header-master' of https://github.com/pauldamiani/moodle 2019-04-03 09:43:51 +08:00
Eloy Lafuente (stronk7)
481c1ae4ce Merge branch 'MDL-64779_master' of git://github.com/dmonllao/moodle 2019-04-02 23:23:13 +02:00
Adrian Greeve
a5b79e4b85 Merge branch 'MDL-65138-master' of git://github.com/lameze/moodle 2019-04-02 10:37:34 +08:00
Paul Damiani
9ffbb78668 MDL-63569 email: New setting to prefix the subject of outgoing emails 2019-04-02 11:02:03 +11:00
David Monllaó
75dfc588b5 MDL-64779 tool_analytics: Export selector 2019-04-01 13:56:37 +02:00
Simey Lameze
73fabadadd MDL-65138 course: add a setting for course publishing 2019-04-01 15:39:07 +08:00
Eloy Lafuente (stronk7)
6c8c286d60 MDL-65218 recycle bin: cover immunization via settings provider
Both for course and category recycle bins
2019-03-31 22:53:53 +02:00
Eloy Lafuente (stronk7)
311123bcce MDL-65218 recycle bin: immunize recycle bin from backup_auto_storage
As far as recycle bin is using MODE_AUTOMATED, it observes the backup_auto_storage
setting (storing backups @ real location. For recycle bin we want to ensure that
backup files are always stored in Moodle file area. In order to achieve that, we
hack the setting here via $CFG->forced_plugin_settings, so it won't interfere other
operations.  See MDL-65218 for more information.

This hack will be removed once recycle bin switches to use its own backup mode, with
own preferences and 100% appart from MODLE_AUTOMATED.
2019-03-31 22:53:41 +02:00
Eloy Lafuente (stronk7)
8793f25279 MDL-65218 recycle bin: Course backups (cat bin) to use MODE_AUTOMATED
Surely this should have been done as part of MDL-63263, but it wasn't.
Better let's do it here so every recycle bin backup is using the
very same mode.
2019-03-29 20:44:16 +01:00
Jun Pataleta
595fa0c5d3 MDL-63876 tool_lp: Fix illegal whitespace 2019-03-29 12:13:48 +08:00
Damyon Wiese
6bdaf20462 MDL-63876 competencies: Skip enabled check
Allow rendering a competency summary if competencies are disabled, but do not include
links to competencies pages.
2019-03-29 11:31:15 +08:00
Damyon Wiese
8aff6f6f14 MDL-63876 badges: Coding style
Add comments to document function params and template example context.
2019-03-29 11:31:15 +08:00
Damyon Wiese
15e6a76e6f MDL-63876 competencies: Use direct URL
Instead of showing competencies in a dialogue, give them their own full url to
display the competency in the framework it belongs to. This is useful for exported
data that won't have access to javascript.
2019-03-29 11:31:15 +08:00
Damyon Wiese
da5e19a128 MDL-63876 badges: Do not call tool_lp directly 2019-03-29 11:31:15 +08:00
Damyon Wiese
f94786e0e1 MDL-63876 badges: Add competency criteria
Properly integration badges with competencies provided in Moodle.

Automatically grant the badge when the defined competencies are marked as proficient.
2019-03-29 11:31:15 +08:00
Sara Arjona
ca06f046af Merge branch 'MDL-64642-master' of https://github.com/albertgasset/moodle 2019-03-26 19:36:21 +01:00
Albert Gasset
f19beb3279 MDL-64642 tool_mobile: Web service tool_mobile_call_external_functions 2019-03-26 16:26:06 +01:00
Juan Leyva
c6ebb024f2 MDL-64337 tool_mobile: Add app promotion text in email notifications 2019-03-26 14:51:21 +01:00
Shamim Rezaie
0b23fad474 MDL-65094 registration: don't encourage registration if on localhost 2019-03-26 16:54:19 +11:00
Sara Arjona
7896fdf106 Merge branch 'MDL-64615-master' of git://github.com/jleyva/moodle 2019-03-25 18:20:01 +01:00
Abhimanyu Kumar
9fff4ebb0a MDL-64959 uploaduser: remove leading/trailing spaces from CSV headings
Earlier while uploading users via CSV, if any leading or trailing space was there in
headings of CSV file then error was displayed which will be difficult for a non-technical
person to understand. After this patch, leading and trailing spaces from headings will
be trimmed automatically.
2019-03-23 22:33:51 +05:30
Damyon Wiese
5a7b845059 MDL-65153 competencies: Urls course competencies
The template for the course competencies page expects a pluginbaseurl parameter
but the webservice that fetches when rendered by AJAX is missing this property.
2019-03-22 13:16:38 +08:00
Eloy Lafuente (stronk7)
a99ef60c6b MDL-63263 tool_recyclebin: show the note as part of the heading element
It looks better (IMO) than using admin_setting_description and works in all
branches.
2019-03-21 00:13:27 +01:00
Eloy Lafuente (stronk7)
5810888077 Merge branch 'MDL-63263-Master' of https://github.com/tuanngocnguyen/moodle 2019-03-20 23:14:32 +01:00
Adrian Greeve
b1869131cf Merge branch 'MDL-60936_master' of git://github.com/dmonllao/moodle 2019-03-20 14:50:46 +08:00
Adrian Greeve
9433fd4424 Merge branch 'MDL-65005-master-fix' of git://github.com/junpataleta/moodle 2019-03-20 13:55:45 +08:00
Jun Pataleta
f50778c822 MDL-65005 tool_policy: Ensure the user's on the Dashboard after agreeing 2019-03-20 12:58:16 +08:00
Adrian Greeve
e081d6000e Merge branch 'MDL-64505-master-final' of git://github.com/mickhawkins/moodle 2019-03-20 09:26:39 +08:00
Eloy Lafuente (stronk7)
a1c99c02cf Merge branch 'MDL-64990_master' of git://github.com/markn86/moodle 2019-03-19 23:03:56 +01:00
Eloy Lafuente (stronk7)
cd8e0cf210 Merge branch 'MDL-64979-master' of https://github.com/sammarshallou/moodle 2019-03-19 22:01:27 +01:00
sam marshall
05a5d547b3 MDL-64979 Behat: Add option to increase timeouts 2019-03-19 17:17:55 +00:00
Eloy Lafuente (stronk7)
6eca6f3e54 Merge branch 'MDL-65006-master' of git://github.com/sarjona/moodle 2019-03-18 23:35:17 +01:00
Eloy Lafuente (stronk7)
e0757dd508 Merge branch 'MDL-63074-master' of git://github.com/bmbrands/moodle 2019-03-18 20:15:48 +01:00
Michael Hawkins
140de372fd MDL-64505 behat: Updated searching admin to work consistently
The way behat_admin::i_set_the_following_administration_settings_values
was searching would fail inconsistently, due to the timing of the steps
not always working correctly.
2019-03-18 18:59:23 +08:00
David Monllaó
3576b66bfd MDL-60936 analytics: Timesplittings setting only for evaluation 2019-03-18 09:34:52 +01:00
David Monllaó
6fce5a13cc MDL-64777 tool_analytics: Static models can also be deleted 2019-04-16 10:46:20 +02:00
Eloy Lafuente (stronk7)
f7e183e513 Merge branch 'MDL-64777-master-modelsrestore' of git://github.com/mudrd8mz/moodle 2019-04-15 23:37:43 +02:00
Eloy Lafuente (stronk7)
5fd5eaf766 Merge branch 'MDL-64786-master-renamemodels' of git://github.com/mudrd8mz/moodle 2019-04-15 22:53:55 +02:00
Eloy Lafuente (stronk7)
75cd6b9a08 Merge branch 'MDL-65307_master' of git://github.com/dmonllao/moodle 2019-04-15 20:43:13 +02:00
David Mudrák
7bd09a69ae MDL-64786 analytics: Make the list of indicators collapsed by default
The list may become very long and it does not help the usability of the
table. Similarly to what we have on the restore models page, we now have
the list of indicators collapsed by default.
2019-04-15 08:22:13 +02:00
David Mudrák
cfb5603e60 MDL-64786 analytics: Fix documentation of models_list template
The list of expected context variables was missing. The example context
was not correct, particularly the help icons are a single object, not a
list.
2019-04-15 08:22:13 +02:00
David Mudrák
066a4d6493 MDL-64786 analytics: Allow renaming models via inplace editable element 2019-04-15 08:22:13 +02:00
David Mudrák
ed47112e1b MDL-64786 analytics: Add missing parameter to model::export() method
All methods that export an object to be rendered via a template, must
have the instance of a renderer available.
2019-04-15 08:17:45 +02:00
David Mudrák
76ef6610bb MDL-64777 analytics: Add ability to restore missing default models
The patch introduces a new page restoredefault.php that allows the user
to select missing models to be restored.
2019-04-15 08:16:58 +02:00
Eloy Lafuente (stronk7)
0163c6e449 Merge branch 'MDL-62907-master' of https://github.com/sammarshallou/moodle 2019-04-14 18:12:56 +02:00
Eloy Lafuente (stronk7)
3d915f5345 MDL-62907 Logging: remove plugin interdependencies
- Move decode_other() from standard to tool_log\helper\reader trait.
- Change all ocurrences to "use" the trait method. But a unit test.
- Duplicate the admin lang strings in database and use them.
- An incorrect phpdoc @package.
2019-04-12 10:49:19 +01:00
sam marshall
12f9acbe76 MDL-62907 Logging: JSON format option for logstore_database 2019-04-11 14:09:36 +01:00
sam marshall
75dc1756bb MDL-62907 Logging: 'other' field option to use JSON format 2019-04-11 14:09:35 +01:00
David Monllaó
e80df160f7 MDL-65307 tool_analytics: Current action including sesskey 2019-04-09 08:03:35 +02:00