mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
81,527 Commits 36 Branches 519 Tags
Commit Graph

81527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
d0cccb4fdb Merge branch 'MDL-53718' of git://github.com/aolley/moodle 2016-11-08 09:59:31 +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
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
Marina Glancy
2a63c0b1c2 MDL-38158 media: missing require and videojs fallback 
Problems picked up by behat tests
 2016-11-07 09:22:32 +08:00
David Monllao
b667a67c47 MDL-29795 mod_assign: Remove empty line 2016-11-07 09:22:02 +08:00
David Monllao
cf4019cf40 Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle 2016-11-07 09:20:59 +08:00
David Monllao
325ac748b2 MDL-29795 behat: Narrow Edit link scope 2016-11-07 09:19:41 +08:00
Andrew Nicols
741c0e6abe MDL-55215 forms: Rename searchableselector params 2016-11-07 09:06:40 +08:00
Andrew Nicols
0e5db67d8e Merge branch 'MDL-55215-master' of git://github.com/damyon/moodle 2016-11-07 09:04:34 +08:00
David Monllao
c9af13123d MDL-54751 course_modules: New major upgrade point 
Also trailing whitespace cleaned.
 2016-11-07 08:59:04 +08:00
David Monllao
90abff01b3 Merge branch 'MDL-54751-master-v5' of https://github.com/snake/moodle 2016-11-07 08:55:44 +08:00
Russell Smith
57a5974a10 MDL-55203 forms: Use correct admin folder name. 
When the admin folder if renamed, the system must replace that when
adding the competencies form elements to the QuickForm Library.
 2016-11-07 11:15:34 +11:00
David Monllao
1370e6ca52 Merge branch 'MDL-56149-master' of git://github.com/damyon/moodle 2016-11-07 07:47:27 +08:00
Jake Dallimore
f939a6d452 MDL-54751 core_completion: Exclude activities pending deletion 2016-11-07 07:41:59 +08:00
Jake Dallimore
ff4230d88e MDL-54751 behat: Support for adhoc module and section deletion in behat 
Introduced new behat step for running all pending adhoc tasks and
modified the relavant behat tests.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
3704ff8cde MDL-54751 phpunit: Support adhoc module and section deletion in phpunit 
Created a new phpunit util function run_all_adhoc_tasks which runs any
pending tasks, for use in unit tests. Added new recyclebin and course
unit tests covering the new functionality.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
2f6e0d92b7 MDL-54751 core_availability: Module restrictions exclude deletions 
To make sure users can't add an access restriction based on a
course module scheduled for deletion, or its respective grade items.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
45bd824e59 MDL-54751 core_grades: Gradebook highlights modules pending deletion 
Added warning to all gradebook pages if any modules are pending
deletion. Modified the return values for get_name, and is_locked for
affected grade items to indicate their pending deletion.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
3869d77411 MDL-54751 core_course: Edit course libs to support deletion flag 
Changed the course libs such that module and section deletion is now
handed off to relevant functions in the util class and exempted
modules scheduled for deletion from the course backups.
 2016-11-07 07:41:59 +08:00