91352 Commits

Author SHA1 Message Date
Andrew Nicols
4c1fc0b6d6 MDL-62589 dataprivacy: Correct not in sql 2018-11-07 19:24:07 +08:00
Bas Brands
f457cb862d MDL-63830 block_myoverview: shorten card titles 2018-11-07 11:47:23 +01:00
Bas Brands
7ba8c72781 MDL-63830 block_myoverview: menu icon position summary 2018-11-07 11:47:23 +01:00
Bas Brands
44b549260d MDL-63830 block_myoverview: reuse css for dashboard blocks
target block content only
use same html accross blocks
add one-row class for scrolling cards
2018-11-07 11:47:04 +01:00
Bas Brands
f1b1f3804e MDL-63830 block_myoverview: rounded images for summary view 2018-11-07 11:23:27 +01:00
Bas Brands
97593c37d8 MDL-63830 block_myoverview: text colour course names
Using same card HTMl for recently accessed courses
2018-11-07 11:23:26 +01:00
Bas Brands
1a97254201 MDL-63830 block_myoverview: move course menu button up 2018-11-07 11:23:26 +01:00
Bas Brands
95acd7b1b4 MDL-63830 block_myoverview: remove margin card title 2018-11-07 11:23:19 +01:00
Jake Dallimore
cd07b3b5cb MDL-63903 core_message: fix bug with shim code in index.php
On backend render (not via js loading), the following bugs were
introduced:
- Message ordering was wrong
- Message blocktimes were wrong
This patches the above to restore legacy behaviour.
2018-11-07 18:19:07 +08:00
Eloy Lafuente (stronk7)
3c577cb583 Merge branch 'MDL-63883-master' of https://github.com/snake/moodle 2018-11-07 10:48:12 +01:00
David Monllao
b6816ed2ca Merge branch 'MDL-63675-master' of git://github.com/bmbrands/moodle 2018-11-07 10:44:57 +01:00
Bas Brands
78c06a660b MDL-63830 block_myoverview: star icon updates
Change the star icon from being in a button and allow it to be
inline using spans instead of divs.
Add the option to passes css classed to the template.
2018-11-07 09:48:00 +01:00
Bas Brands
aba5b89c7a MDL-63830 block_myoverview: card footer styles 2018-11-07 09:00:18 +01:00
Bas Brands
2b311e7689 MDL-63830 block_myoverview: progressbar styles boost
using bg-white and border
allow collapsing of list view content
removed obsolete styles for old progress circles bootstrapbase
2018-11-07 08:59:29 +01:00
Damyon Wiese
d4035711f9 Merge branch 'MDL-63898-master' of https://github.com/snake/moodle 2018-11-07 15:30:52 +08:00
Jun Pataleta
134f262ee3 Merge branch 'master_MDL-63800' of https://github.com/danmarsden/moodle 2018-11-07 15:27:27 +08:00
Damyon Wiese
da151c9b75 Merge branch 'MDL-63839_master' of git://github.com/markn86/moodle 2018-11-07 14:29:02 +08:00
Jake Dallimore
74fc14e5b2 MDL-63898 core_message: fix for get_conversations message formatting
This used to return a text version of the message, but needs to return
the message formatted with message_format_message_text().
2018-11-07 14:23:54 +08:00
Damyon Wiese
8313f552b6 Merge branch 'MDL-63451' of https://github.com/peterspicer-catalyst/moodle 2018-11-07 12:05:27 +08:00
Damyon Wiese
eb935dab5b Merge branch 'MDL-63884-master' of https://github.com/snake/moodle 2018-11-07 11:00:41 +08:00
Juan Leyva
c1720141fd MDL-63708 tool_mobile: Add options for disabling blocks
Now that we are supporting the new dashboard and site home blocks on the mobile app,
we need options to allow admin to forbid certain blocks to be displayed on the app.
2018-11-07 00:32:32 +01:00
Jun Pataleta
e862985a69 MDL-63183 auth_shibboleth: Don't render page when already logged in 2018-11-07 00:14:48 +01:00
Jun Pataleta
5f9955b5a0 MDL-63183 auth_shibboleth: Add hidden login token in guest login form 2018-11-07 00:14:48 +01:00
Damyon Wiese
6dfe428363 MDL-63183 auth: Login protection
CSRF protection for the login form. The authenticate_user_login function was
extended to validate the token (in \core\session\manager) but by default it
does not perform the extra validation. Existing uses of this function from
auth plugins and features like "change password" will continue to work without
changes. New config value $CFG->disablelogintoken can bypass this check.
2018-11-07 00:14:48 +01:00
Eloy Lafuente (stronk7)
ef79de12ee Merge branch 'm36_MDL-63789_Search_SOLR_Fixes_Proxy_Auth' of https://github.com/scara/moodle 2018-11-07 00:08:12 +01:00
Eloy Lafuente (stronk7)
08c51ff080 on-demand release 3.6dev+ 2018-11-06 19:06:54 +01:00
Eloy Lafuente (stronk7)
fca12fd991 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-11-06 19:06:52 +01:00
Damyon Wiese
1c7288e79b Merge branch 'MDL-58454-master-fix' of git://github.com/junpataleta/moodle 2018-11-06 15:48:31 +01:00
Jun Pataleta
e75860caea MDL-58454 badges: Use correct function for fetching badge issuer 2018-11-06 15:48:31 +01:00
Andrew Nicols
6d47156f75 Merge branch 'MDL-63711-master-fix' of git://github.com/junpataleta/moodle 2018-11-06 15:48:30 +01:00
Jun Pataleta
5c145757a8 MDL-58454 core: Fix savepoint in upgrade.php 2018-11-06 15:48:30 +01:00
Jun Pataleta
ad2737c9c9 MDL-63711 core_grade: Use canonicalize for checking userlist IDs 2018-11-06 15:48:30 +01:00
David Monllao
2bdc254cd2 Merge branch 'MDL-58454-master' of git://github.com/junpataleta/moodle 2018-11-06 15:48:23 +01:00
Damyon Wiese
d769d7c2db Merge branch 'MDL-63297' of https://github.com/timhunt/moodle 2018-11-06 15:45:23 +01:00
Jake Dallimore
003cdcce15 MDL-63884 core_message: add imageurl support for linked conversations
This is an extra field specific to linked conversations, so the helper
method has been extended to encompass this alongside the subname field.
2018-11-06 16:51:44 +08:00
Jake Dallimore
19237383f3 MDL-63884 core: allow tests to set group pictures when creating groups 2018-11-06 16:42:46 +08:00
Jake Dallimore
741376f3e7 MDL-63883 core_message: fix random externnallib_test phpunit failure
Users created by the test generator could have the same name as one
another, so trying to assert names NOT in an array would clash. Fix
is to remove those assertions - there were superfluous anyway.
2018-11-06 14:17:51 +08:00
Jun Pataleta
9639cb487e MDL-58454 badges: Fix related badge deletion
* When deleting a badge, delete badge_related records where this badge
is also set as the related badge.
2018-11-06 11:47:20 +08:00
Jun Pataleta
eea49debc8 Merge branch 'MDL-63062-master-renamed' of https://github.com/vmdef/moodle 2018-11-06 10:32:18 +08:00
Andrew Nicols
74238c1c18 Merge branch 'MDL-62563-master-3' of git://github.com/mihailges/moodle 2018-11-06 09:37:23 +08:00
Bas Brands
4edd1bb089 MDL-63863 block_myoverview: remove superfluous div
So the clean suite in behat will be back to pass.
2018-11-06 01:18:37 +01:00
AMOS bot
a36021e293 Automatically generated installer lang files 2018-11-06 00:07:16 +00:00
Víctor Déniz Falcón
4f6680a1e9 MDL-63062 block_recentlyaccessedcourses: add starred icon 2018-11-05 23:51:49 +00:00
Víctor Déniz Falcón
41f6129358 MDL-63062 block_recentlyaccessedcourses: add block and styles 2018-11-05 23:46:57 +00:00
Victor Deniz
98a52c80bb MDL-63062 block_recentlyaccessedcourses: add web service 2018-11-05 23:46:43 +00:00
Dan Marsden
e6a93dc215 MDL-63800 mod_assign: don't show grade if not set. 2018-11-06 10:04:15 +13:00
Tim Hunt
ad89de38eb MDL-63875 qtype_ddmarker: fix layout with multi-line markers 2018-11-05 17:45:05 +00:00
Sara Arjona
5a1ea82835 MDL-58454 badges: Fix some minor errors for Open Badges v2 2018-11-05 18:41:54 +01:00
David Monllao
6e90098e7b Merge branch 'MDL-63711-master' of git://github.com/abgreeve/moodle 2018-11-05 16:35:34 +01:00
Tung Thai
d363a5c2e6 MDL-58454 badges: Open Badges Specification Version 2.0 Changes 2018-11-05 14:20:46 +01:00