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

22588 Commits

Author SHA1 Message Date
Damyon Wiese
e7bda18de6 MDL-56705 forms: Use [] for multiple values 
Some "select" based form elements are not inheriting directly from
MoodleQuickForm_select - so did not have the adjustment to the form
field name that allows multiple values. I moved this fix to the
templateable trait so all the form fields get this fix.
 2016-11-10 14:57:58 +08:00
Rajesh Taneja
e4c98de168
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 18:06:09 +08:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Andrew Nicols
3e85e02a98 Merge branch 'MDL-55992-master' of git://github.com/jleyva/moodle 2016-11-08 13:41:22 +08:00
Andrew Nicols
11361f35be MDL-56737 externallib: Fetch token after inserting 2016-11-08 12:45:57 +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
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)
a584a403cd Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle 2016-11-07 16:19:06 +01: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
Jake Dallimore
a9ac13885c MDL-54751 core_grade: Fix missing require_once in grade_item get_name 2016-11-07 14:35:16 +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
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
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
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
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
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
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
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
f95c00e551 Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle 2016-11-04 14:31:00 +00:00
Marina Glancy
fab11235d8 MDL-38158 core_media: Convert media players to new plugin type 
AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
 2016-11-04 17:30:40 +08:00
Marina Glancy
3c73b26c4b MDL-38158 core_media: more correct semantic for html5 video audio tags 2016-11-04 17:30:31 +08:00
Andrew Nicols
11bafc2b21 Merge branch 'MDL-56641-master' of git://github.com/damyon/moodle 2016-11-03 15:07:01 +08:00
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
David Monllao
5d0299e275 Merge branch 'MDL-56666-master' of git://github.com/jleyva/moodle 2016-11-03 10:28:59 +08:00
Damyon Wiese
2a7c540c48 MDL-56641 admin: Managers can access search page 2016-11-03 09:36:33 +08:00
John Beedell
6e1e299554 MDL-54986 Quiz: Disable add button for quiz with attempts 2016-11-02 17:02:59 +00:00
Dan Poltawski
56f763b1f9 Merge branch 'MDL-55841-master' of https://github.com/xow/moodle 2016-11-02 15:24:33 +00:00
Dan Poltawski
ab64cd40b0 Merge branch 'MDL-56372_static_bind_clean_return_val' of https://github.com/BenKelada/moodle 2016-11-02 15:14:46 +00:00
Dan Poltawski
cb2b9a905c Merge branch 'MDL-55825-master' of git://github.com/junpataleta/moodle 2016-11-02 14:41:10 +00:00
Dan Poltawski
4d27d62d08 Merge branch 'wip-MDL-55927-master' of git://github.com/abgreeve/moodle 2016-11-02 14:00:29 +00:00
Dan Poltawski
de8388f529 Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle 2016-11-02 13:56:22 +00:00