mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
81,511 Commits 36 Branches 519 Tags
Commit Graph

81511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
5ffd3f3309 Merge branch 'MDL-54751-master-gradeitemfix' of git://github.com/snake/moodle 2016-11-07 14:43:23 +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
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
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
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
Jake Dallimore
37da62f360 MDL-54751 core_course: Create adhoc task for course module deletion 2016-11-07 07:41:59 +08:00
Jake Dallimore
048f909b07 MDL-54751 core: introduce deletion flag for course modules 
Created a flag, 'deletioninprogress' on the course_modules table to be
used when deleting course modules and course sections. Modified
modinfolib caches such that, when rebuilt, these caches hide the
relevant modules based on the value of the flag.
 2016-11-07 07:41:59 +08:00
Eloy Lafuente (stronk7)
b23b9a5b38 MDL-38158 core_media: bump upgrade / version and fix filter test 2016-11-06 02:11:20 +01:00
Eloy Lafuente (stronk7)
6e29346609 Merge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle 2016-11-06 02:11:19 +01:00
Juan Leyva
a947ecd634 MDL-56737 tool_mobile: Support private tokens in launch.php 2016-11-04 15:37:42 +00:00
Dan Poltawski
f0049415af MDL-56684 competencies: fix eslint probs in templates 2016-11-04 14:59:57 +00:00
Damyon Wiese
207136f279 MDL-56684 competencies: Boost for competency templates 
Add BS4 markup to all competencies templates. Also tweaked the template library to make it
easier in future when modifying templates and reloading.
 2016-11-04 14:45:58 +00:00
Dan Poltawski
f95c00e551 Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle 2016-11-04 14:31:00 +00:00
Dan Poltawski
b7b5b35cf5 Merge branch 'MDL-56668-m' of https://github.com/micaherne/moodle 2016-11-04 14:23:10 +00:00
Dan Poltawski
246288c3f9 Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle 2016-11-04 14:20:14 +00:00
Dan Poltawski
1e1e4ff8e5 Merge branch 'MDL-56535-master' of git://github.com/jleyva/moodle 2016-11-04 14:10:48 +00:00
Dan Poltawski
808005ddf9 Merge branch 'MDL-53945' of git://github.com/aolley/moodle 2016-11-04 14:07:26 +00:00
Tony Lin
ce1249be58 MDL-56731 groups: Fixes breadcrumb when returning to groups/index.php 2016-11-04 13:21:43 +00:00
Dan Poltawski
7eb34671c1 on-demand release 3.2dev+ 2016-11-04 11:20:34 +00:00