mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-22 02:49:53 +01:00
Code Issues Projects Releases Wiki Activity
81,543 Commits 36 Branches 523 Tags
Commit Graph

81543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
9280f62e38 MDL-56196 mod_lti: Fix popups and secret form in boost 2016-11-08 14:27:26 +08:00
Frédéric Massart
3d979f9676 MDL-56196 mod_lti: Adapt templates for both Boost and Clean 2016-11-08 14:11:14 +08:00
David Monllao
dc3852ae1e Merge branch 'MDL-56601-master-3' of git://github.com/cameron1729/moodle 2016-11-08 12:25:31 +08:00
Cameron Ball
c86500a4b7
MDL-56601 core_user: Disable profile picture field if user is not setup 
Sometimes it is possible that a user is presented with the profile
edit form, but is in a state where they are not considered fully
set up (one example is when a site is installed using the CLI script)

In these cases the filepicker gets upset when the user tries
to upload a profile picture.

This patch simply disables that field in these cases and replaces it
with an error message explaining what's wrong.
 2016-11-08 12:13:51 +08:00
David Monllao
1fd6b25579 MDL-56561 bootstrapbase: Remove empty line 2016-11-08 11:39:28 +08:00
David Monllao
23e6d7f36c Merge branch 'MDL-56561-master' of git://github.com/damyon/moodle 2016-11-08 11:38:49 +08:00
David Monllao
d5e22210b6 Merge branch 'MDL-29795-master-fix-backup-restore' of git://github.com/ilya-catalyst/moodle 2016-11-08 11:12:17 +08:00
Damyon Wiese
aad8c7167f MDL-56561 admin: Style admin page listing entire admin tree 
It was an unstyled list of links. This changes it to tabs with sub-headings.
 2016-11-08 11:04:10 +08:00
Andrew Nicols
9c5a55b52a Merge branch 'wip-MDL-56120-master-v2' of git://github.com/abgreeve/moodle 2016-11-08 10:31:12 +08:00
David Monllao
929190533f Merge branch 'MDL-56818-master' of git://github.com/lameze/moodle 2016-11-08 10:27:36 +08:00
Simey Lameze
0b20349f32 MDL-56818 messages: remove duplicated messaging enabled check 2016-11-08 10:26:39 +08:00
Ilya Tregubov
f67f5f0245 MDL-29795 assign: add missing sortorder column for overrides when backing up a course 2016-11-08 13:23:22 +11:00
Andrew Nicols
f4e203209d Merge branch 'MDL-54751_master-fix-cron-user' of git://github.com/dmonllao/moodle 2016-11-08 10:01:04 +08:00
David Monllao
d0cccb4fdb Merge branch 'MDL-53718' of git://github.com/aolley/moodle 2016-11-08 09:59:31 +08:00
David Monllao
44eb1490c4 MDL-54751 course: Set adhoc task user 
We should complete the deletion process using the same
user that started it.

Added a new param to loginas() to prevent the event to be generated as
there is no need to generate an new event for that as the user didn't
explicitly loginas again.
 2016-11-08 09:45:07 +08:00
Eloy Lafuente (stronk7)
42fe364f41 Merge branch 'MDL-56765-master' of git://github.com/jleyva/moodle 2016-11-08 01:27:39 +01:00
Eloy Lafuente (stronk7)
a584a403cd Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle 2016-11-07 16:19:06 +01:00
Dan Poltawski
77b0bafa6d Merge branch 'MDL-56696-master' of git://github.com/lameze/moodle 2016-11-07 11:33:55 +00:00
Dan Poltawski
13ab169cb7 Merge branch 'wip-MDL-56788-master' of git://github.com/abgreeve/moodle 2016-11-07 09:01:24 +00:00
Adrian Greeve
cbbca0d00f MDL-56120 Calendar: Unit tests for getting events. 
Added a unit test for checking that calendar_get_events
will only return events for activated activities.
 2016-11-07 16:48:16 +08:00
Adrian Greeve
7a33494d71 MDL-56120 calendar: Fix disabled modules showing events. 
calendar_get_events now checks for disabled activities
and only shows events for active modules.
 2016-11-07 16:47:14 +08:00
Dan Poltawski
912d854dc8 Merge branch 'MDL-56684-master-fix1' of http://github.com/damyon/moodle 2016-11-07 08:19:16 +00:00
Damyon Wiese
c81a34774e MDL-56684 boost: Fix for competency behat tests with boost theme 2016-11-07 16:02:44 +08:00
Andrew Nicols
09b7cfc559 Merge branch 'MDL-56025-master' of git://github.com/damyon/moodle 2016-11-07 15:09:47 +08:00
Andrew Nicols
f1b018f511 Merge branch 'MDL-55215-master-fix2' of http://github.com/damyon/moodle 2016-11-07 15:01:46 +08:00
David Monllao
5ffd3f3309 Merge branch 'MDL-54751-master-gradeitemfix' of git://github.com/snake/moodle 2016-11-07 14:43:23 +08:00
Damyon Wiese
c3e7274369 MDL-56025 messages: Reduce the height on short screens 
On windows shorter than 670px reduce the height of the message area.
 2016-11-07 14:41:21 +08:00
Jake Dallimore
a9ac13885c MDL-54751 core_grade: Fix missing require_once in grade_item get_name 2016-11-07 14:35:16 +08:00
Simey Lameze
b445f4b342 MDL-56696 message: link user full name to contact options 2016-11-07 14:35:13 +08:00
Damyon Wiese
737b54fe9e MDL-55215 lesson: JS is required for some lesson behats 
Lesson is using the searchselector which only supports JS - so some
tests need javascript tags.

Also fixed support for filling a passwordunmask field with JS enabled by
id.
 2016-11-07 14:23:46 +08:00
David Monllao
d7480befdd Merge branch 'wip-MDL-38158-fix3' of https://github.com/marinaglancy/moodle 2016-11-07 14:19:15 +08:00
David Monllao
2a9275601a Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle 2016-11-07 13:58:04 +08:00
Adam Olley
b4846b88d9 MDL-53718 badges: Dont display course badges when disabled 2016-11-07 15:56:26 +10:30
Andrew Nicols
a2c0528802 Merge branch 'MDL-56737-master' of git://github.com/jleyva/moodle 2016-11-07 13:25:41 +08:00
David Monllao
b03a53576d Merge branch 'MDL-56630-master' of git://github.com/damyon/moodle 2016-11-07 13:15:03 +08:00
Marina Glancy
fbb36ed1e6 MDL-38158 media: some players do not want fallback to other players 
there is already logic to determine whether html5 is supported;
otherwise we may end up with nested <audio> or <video> tags
 2016-11-07 11:55:05 +08:00
Marina Glancy
737638d950 MDL-38158 media: mpeg is not html5 supported format 2016-11-07 11:44:59 +08:00
Andrew Nicols
235a80b2d5 Merge branch 'MDL-55215-master-fix1' of http://github.com/damyon/moodle 2016-11-07 11:39:45 +08:00
Adrian Greeve
f0568ed9af MDL-56788 themes: Update require to use admin setting. 
The renderer now uses the $CFG->admin setting in the
require_once call.
 2016-11-07 11:16:34 +08:00
David Monllao
d2790f5c8f Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle 2016-11-07 11:15:58 +08:00
Damyon Wiese
9f592c243c MDL-55215 forms: Searchable selector was reindexing keys 2016-11-07 11:03:17 +08:00
David Monllao
ab7c5d1068 Merge branch 'MDL-56731_master' of https://github.com/tonynlin/moodle 2016-11-07 10:44:32 +08:00
Damyon Wiese
72deb9c861 MDL-56630 theme_boost: Edit settings menu not always showing when it should 2016-11-07 10:44:19 +08:00
Damyon Wiese
a0bdffbd73 MDL-56630 theme_boost: show blocks under content on small screens 
This is tablet size and down.
 2016-11-07 10:37:13 +08:00
Andrew Nicols
3e24a75ec3 Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle 2016-11-07 10:22:25 +08:00
Jonathon Fowler
6b0d172379 MDL-56129 core: Change HTTP error code for iOS 10 video playback 
This patch changes the effective response code from a 407 to a 403 when
erroring on iOS 10 and when a HTTP_X_PLAYBACK_SESSION_ID HTTP header is
found.

This causes the iOS Media framework to send the cookie with the request
which subsequently succeeds.
 2016-11-07 09:55:49 +08:00
Damyon Wiese
1d4928003c MDL-56241 boost: Wrap block footer in a div to emulate old layout 
Some block styles are looking for .footer so we'll add it back.
 2016-11-07 09:51:39 +08:00
David Monllao
cf36f123d5 Merge branch 'MDL-55203' of https://github.com/mr-russ/moodle 2016-11-07 09:49:33 +08:00
Dan Poltawski
fb42071776 MDL-56241 theme_boost: add example context to block.mustache 2016-11-07 09:41:05 +08:00
Damyon Wiese
f93be27185 MDL-56241 theme_boost: Add content class to blocks 
Some of the plugin styles assume .content in the selectors.
 2016-11-07 09:41:04 +08:00